Skip to content

GitLab

Switch branch/tag
  1. 28 Feb, 2013 2 commits
  3. 21 Feb, 2013 3 commits
  5. 01 Feb, 2013 1 commit
  7. 29 Jan, 2013 1 commit
  9. 17 Jan, 2013 1 commit
  11. 15 Jan, 2013 1 commit
  13. 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
  15. 04 Dec, 2012 1 commit
  17. 22 Nov, 2012 1 commit
  19. 05 Oct, 2012 1 commit
  21. 27 Sep, 2012 1 commit
  23. 24 Sep, 2012 1 commit
  25. 16 Aug, 2012 1 commit
  27. 30 Jul, 2012 1 commit
  29. 19 Jul, 2012 1 commit
  31. 21 Jun, 2012 1 commit
    • Tobias Hunger's avatar
      Profile introduction · 24314562
      Tobias Hunger authored 
      Introduce Profiles to store sets of values that describe a system/device.

These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.

This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.

Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
      24314562
  33. 23 Mar, 2012 1 commit
  35. 13 Mar, 2012 1 commit
  37. 16 Feb, 2012 1 commit
    • Erik Verbruggen's avatar
      Supply c++11 flags and per-project info to c++ code model. · 3aab8bea
      Erik Verbruggen authored 
      A manual squash/merge of the changes below, plus a couple of subsequent
code fixes.

59085aa5fbb99e2d786cd2c1a06c24a111ccb49f:
    Modify CppModel::ProjectInfo

    Adding per project node information, to pass on the correct
    defines/includes for each file, instead of aggregating them incorrectly.

    Also split up SOURCES and OBJECTIVE_SOURCES.

    Also ask the toolchain to convert the compilerflags to flags the
    codemodel understands, for now only gcc and only c++11.

    Also make the toolchain aware of the flags used to compile, so that it
    can emit the correct defines.

    Note: No header files are passed on.

74028802314cd4e75b41b46407433e07090a304d:
    GCC: Evaluate cxxflags when checking for predefined macros

ebaaa4957e4c02cc9637a998eddae1d0acd74f83:
    MSVC: Take cxxflags into account when checking for predefined macros

9bfce7e889bcf7bcc47bf880e3ea25945ca7d0d7:
    Compile fixes

Change-Id: I9de94ad038dfc5dc1987732e84b13fb4419c96f5
Reviewed-by: default avatarErik Verbruggen <erik.verbruggen@nokia.com>
      3aab8bea
  39. 15 Feb, 2012 1 commit
  41. 09 Feb, 2012 2 commits
  43. 31 Jan, 2012 1 commit
  45. 30 Jan, 2012 2 commits
    • Tobias Hunger's avatar
      Win: Add comparison operator to MSVC and WinCE tool chain · 2ef12d87
      Tobias Hunger authored 
      The comparison operator on the abstractmsvctoolchain is not enough.

Change-Id: I5d8db422d4a996e561a25dc754a9eba151b75ff1
Reviewed-by: default avatarTobias Hunger <tobias.hunger@nokia.com>
      2ef12d87
    • Tobias Hunger's avatar
      Use QUuids to identify tool chains · 52b47364
      Tobias Hunger authored 
      Save/Restore has been updated to reflect this:

We now save manual as well as auto-detected tool chains into the user
toolChains.xml file.

When loading we load the SDK as well as the user toolChains.xml files.
We then do a autodetection run. All the tool chains restored that are
marked up as auto-detected are then checked again:
 * the tool chain was autodetected again: Throw away the newly auto-
   detected tool chain and reuse the saved one. This makes sure we
   keep the QUuid that is now part of the tool chains id.
 * the tool chain was not autodetected again: Throw away the saved
   tool chain.
 * the tool chain was newly autodetected: Add the new tool chain

We keep the old id around in the legacyId() method. It is used when
loading old .user files only. So there is no need to implement this
method for new tool chains.

Task-number: QTCREATORBUG-6702

Change-Id: Ifc0a216e5351a8a57db03615ba329e355e7d5f59
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
      52b47364
  47. 26 Jan, 2012 1 commit
  49. 19 Jan, 2012 1 commit
  51. 17 Jan, 2012 1 commit
  53. 09 Jan, 2012 1 commit
  55. 13 Dec, 2011 1 commit
  57. 07 Dec, 2011 1 commit
  59. 24 Nov, 2011 1 commit
  61. 03 Nov, 2011 1 commit
  63. 04 Oct, 2011 1 commit
  65. 10 Aug, 2011 1 commit
  67. 13 Jul, 2011 1 commit
  69. 12 Jul, 2011 1 commit