Skip to content

GitLab

Switch branch/tag
  1. 16 Oct, 2013 1 commit
  3. 09 Oct, 2013 2 commits
  5. 26 Sep, 2013 1 commit
  7. 11 Sep, 2013 1 commit
  9. 04 Sep, 2013 1 commit
  11. 30 Aug, 2013 1 commit
  13. 28 Aug, 2013 3 commits
  15. 08 Jul, 2013 1 commit
    • Daniel Teske's avatar
      Project: Simplfy file adding/removing interface · cc7fe5ea
      Daniel Teske authored 
      The filetype is only relevant for Qt4 projects. But even for Qt4 projects
the file type is insufficient to decide where the file should be added.
So remove the file type from the interface and let the projectmanagers
themselves figure out what they want to do.

Also fix
Task-number: QTCREATORBUG-9688

Change-Id: I02f7b1cd2e05efaf76e36fb9af34b109d4482f88
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
      cc7fe5ea
  17. 14 Jun, 2013 1 commit
  19. 04 Jun, 2013 1 commit
  21. 29 May, 2013 1 commit
  23. 24 May, 2013 1 commit
  25. 22 May, 2013 1 commit
    • Christian Strømme's avatar
      Android: Detect conditional dependencies. · 35b96f2f
      Christian Strømme authored 
      To solve the problem with libQt5MultimediaQuick_p we need a way to detect
if an application is using both QtMultimedia and QtQuick.
This change adds logic to parse the -dependencies.xml file and look for
lib elements that have the extra attribute "extends". Libs with the
extends attribute will only be added to the list of dependencies, if the
library it extends is available.

Task-number: QTCREATORBUG-9300
Change-Id: I6f3e0a6d9158a91824e1e113f6aab7ec1112dd56
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
      35b96f2f
  27. 17 May, 2013 1 commit
  29. 15 May, 2013 1 commit
  31. 06 May, 2013 1 commit
  33. 03 May, 2013 1 commit
  35. 02 May, 2013 1 commit
  37. 30 Apr, 2013 1 commit
  39. 17 Apr, 2013 1 commit
  41. 16 Apr, 2013 1 commit
  43. 27 Mar, 2013 1 commit
  45. 25 Mar, 2013 1 commit
  47. 18 Mar, 2013 1 commit
    • Eskil Abrahamsen Blomfeldt's avatar
      Android: Fix use_local_libs when running from launcher · a20dd013
      Eskil Abrahamsen Blomfeldt authored 
      The old way of passing the use_local_libs settings to the
app (which is still supported for compatibility with Necessitas)
was to pass it as command line arguments when the app is
launched from Qt Creator. This will make the app depend on
Ministro if it's later launched from the Android launcher.
To avoid this, we pass the info as part of AndroidManifest.xml
instead.

Task-number: QTCREATORBUG-8643
Change-Id: Ib044ce8bf7e285cf46075a8713bd7fc6736052d5
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
      a20dd013
  49. 12 Mar, 2013 1 commit
  51. 11 Mar, 2013 1 commit
  53. 04 Mar, 2013 1 commit
  55. 18 Feb, 2013 2 commits
  57. 07 Feb, 2013 1 commit
    • Daniel Teske's avatar
      Simplify Android settings, move debugger/gdbserver to Kit · 4a890f6d
      Daniel Teske authored 
      Creator now realiable creates one toolchain for each toolchain found in
the ndk. This no longer depends on any qt versions being present.

Also the gdb command and gdb server command are moved to the Kit and are
no longer found in the Android Options page. Both settings can be
autodetected from the Kit options page. Note that this might break
existing android kits.

Change-Id: I1dce084f2bb372e615e19b1c9e3a1e205b5d9647
Reviewed-by: default avatarBogDan Vatra <bogdan@kde.org>
      4a890f6d
  59. 29 Jan, 2013 1 commit
  61. 17 Jan, 2013 1 commit
  63. 08 Jan, 2013 1 commit
    • Orgad Shaneh's avatar
      Remove braces for single lines of conditions · 29a93998
      Orgad Shaneh authored 
      #!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: default avatarhjk <qthjk@ovi.com>
      29a93998
  65. 13 Dec, 2012 1 commit
  67. 16 Nov, 2012 2 commits
  69. 05 Oct, 2012 1 commit