feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,929 Commits 108 Branches 368 Tags
3b901b25a86f49ebef9be03ec762ed76422fd91c
Commit Graph

4400 Commits

Author SHA1 Message Date
Eike Ziller
9790d8aa00 Merge remote-tracking branch 'origin/3.4' 2015-03-24 07:40:21 +01:00
hjk
2b7c83bfbf Tests: Add a shootout test for implementations of operator== 
That's for a structure mimicking QMakeStepConfig, comparing
a.x == b.x && a.y == b.y ... with
std::tie(a.x, a.y, ...) == std::tie(b.x, b.y, ...)

Executive summary: gcc 4.9.1 optimizes the traditional == && == better.
This is solely due to the sequence of four bools in the struct.

Change-Id: I77cc8d685c6b7b7ead651cd1f44ff1b2e9b39f3d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
 2015-03-23 12:09:45 +00:00
David Schulz
0b6b5631b7 Tests: Dumper: Fix QByteArray dumper test for cdb. 
Change-Id: Ic5cdf0092d720bc13c1609b6e489e48712645f8b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-23 08:48:46 +00:00
David Schulz
81a70627a4 Tests: Dumper: Add current data tag to tmp build dir name. 
Change-Id: I91c26bcb70a10ed00c32f8bf18f16e0ac449c5b6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-03-19 07:24:09 +00:00
hjk
e8f8aaa263 Debugger: Fix dumper format choosing with GDB 
... and further unify GDB and LLDB code paths.

Change-Id: Id89f3804c53190c4888082891fd3c3c55eceac84
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-19 06:59:01 +00:00
Christian Stenger
693e1b7227 Squish: Improve tst_default_settings 
Change-Id: I6aebbf300e9e86729c0b00bee3bb9b6d4bf87854
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-03-17 16:59:41 +00:00
Christian Stenger
3cd9bbb550 Tests: Fix building 
Change-Id: I381bb020b75fbc7e43bff6bd2fef5982ed114c14
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-03-17 10:00:35 +00:00
Orgad Shaneh
b1e839c21b Tests: Cleanup project files for Utils tests 
Change-Id: I75ad17d12994376d88117570250a6c45e7495fea
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-17 09:39:19 +00:00
Orgad Shaneh
cde50f23fc Tests: Fix compilation 
Change-Id: I7cb3b5636413abfc52578e8ae0c43f745efa2f0d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-03-14 17:26:12 +00:00
Orgad Shaneh
a341094a68 C++: Fix preprocessing of comments within function-like macro 
Task-number: QTCREATORBUG-9535
Change-Id: Ifd94f674214314b3694be74cca297ddab873cd8c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2015-03-13 14:34:07 +00:00
Nikolai Kosjar
4e1d281963 C++: Fix crash on invalid function qualified name 
Task-number: QTCREATORBUG-14135
Change-Id: I94e850f729bd3dbf4212960c7a980a1f118030b4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-03-13 13:21:04 +00:00
Christian Stenger
66c29ea8ec Squish: Fix tst_CSUP03 
Change-Id: I6556440ebcf77ae3164c4f659ff1c4b6e189d6ea
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-03-13 13:08:07 +00:00
Orgad Shaneh
c9b71a268b C++: Provide better output on preprocessor test failure 
Make the expected output copyable to the test.

Change-Id: I4fc61682f14d0de054a11d2ffa4a0f36ede0e500
Reviewed-by: Francois Ferrand <thetypz@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2015-03-13 11:28:11 +00:00
Robert Loehning
cb42ff0deb Squish: Fix WELP03 
Change-Id: Idf0c03b8a4746f63ab16c7391bc69d65629d7643
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-11 15:33:12 +00:00
Christian Stenger
14a02d5081 Debugger: Tests: Fix execution of dumper tests on OSX 
Change-Id: Ibe3e447d29e3834766ef067ba4424c3b08ba5eb1
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-03-10 08:55:14 +00:00
Robert Loehning
559d8dc203 Squish: Fix tst_simple_analyze 
Change-Id: I56a7c2a651fc9d2701cf650279a677856b6cf84c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-09 14:36:56 +00:00
Sergio Ahumada
2c876f7443 Update some more links to qt.io 
Change-Id: I043cf78f128dc8d99e3316b951cf91d2f6d6524a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-03-09 14:30:39 +00:00
Christian Stenger
4a9bf879fc Squish: Fix generic highlighter test 
New MIME type handling differentiates between Haskell and
Literate Haskell.

Change-Id: Iaf1cabb5720b47a893b0755f59b3626d01835ca6
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-03-09 11:48:18 +00:00
Christian Stenger
c9c7d32bd7 Tests: Fix shootout test running on Windows 
Change-Id: I0774429a3106fc0e382852a4ed50d2e2ffc8e164
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-03-06 07:31:15 +00:00
Christian Stenger
7142402429 Squish: Fix tst_rename_file 
Changed behavior due to changes related to MIME database.

Change-Id: I54bbfd8ca5d027716ef6bca308df0863635fe474
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-03-05 12:25:53 +00:00
Friedemann Kleint
1b9be30371 Clean headers in lib qmljs and plugins qmljstools, qmljseditor. 
Change-Id: I3256db8f4d42b6326d986d754b45e6c6c2030839
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-03-05 08:17:10 +00:00
hjk
46d515529a Tests: Use real project dependencies in memcheck test 
Change-Id: Iced26e5b2a4a4ba5e1075e19eeffe96b2e298d0f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-04 14:03:29 +00:00
hjk
e35809bd31 Add shootout test for multiple identical lambdas 
This helps to compare code sizes generated by lambdas.

Change-Id: I6734a26f59ec622ec8d4dfdea2c9e83340c11d73
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-04 09:29:55 +00:00
Christian Stenger
9a798af144 Tests: Fix valgrind test 
Change-Id: I5e05575d0858ef1b8e2d5b3fb8b00b006a11c065
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-03-02 14:59:40 +00:00
Orgad Shaneh
79525981dc Tests: Refix MSVC warnings for valgrind tests 
Fix in 5a5acd664e was incomplete.

Change-Id: I36a0666d2a6a8ccb514ebf612fbac2eded150102
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2015-03-02 09:53:14 +00:00
Orgad Shaneh
d63624afe0 C++: Accept language features in BackwardsScanner et al 
Change-Id: Id97ca27fa909979573efca12dc0cd14b28eacd17
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2015-02-27 15:11:14 +00:00
Francois Ferrand
1336502f58 C++: fix parsing nested C99 designated initializers. 
Change-Id: Iaa0e7550abf6be77601b1852652bb3d0731d0323
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2015-02-27 14:49:55 +00:00
Przemyslaw Gorszkowski
9e513774b1 C++: resolved self-value reference for enum 
Added support for resolving case:
enum E
{
  val1,
  val2 = val1, // val2-4 are not resolved
  val3,
  val4
};

Task-number: QTCREATORBUG-13932
Change-Id: I122c5eb0b0397d6c02bc3db0a5c1ea1c28c5c6e7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2015-02-25 15:01:02 +00:00
Robert Loehning
4413096cae Squish: Add Qt 5.4.1 kit 
Change-Id: I8efa72f8695796bd69af11e9904fae143137d1e6
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-25 14:17:54 +00:00
hjk
c992a9ff08 Debugger: Add dumpers for QPolygon{,F} and QGraphicsPolygonItem 
Change-Id: Ic246b28d44312a677c8d41194d4e0c324bda125d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-24 14:48:33 +00:00
hjk
97cbfb95bb Add manual test code to check generated code size 
Change-Id: Idc65f441c3af09f1fcd5cff646cc7b472aed1770
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-02-20 10:01:09 +00:00
Robert Loehning
243a0e54be Squish: Fix bitwise operators for selecting kits 
Change-Id: I4373e8f07b124f61a743d5c922a45f2962ac7392
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-19 13:35:45 +00:00
Christian Kandeler
05f8a2c813 qbs build: Introduce convenience project property sharedSourcesDir. 
Change-Id: I69aacc7391e6e25e66eae1fb54b3c1cfb18679ee
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
 2015-02-18 14:49:06 +00:00
Robert Loehning
baf62f94fb Squish: Remove outdated note about Qt4 from README 
Change-Id: I0638a56d6bd833a6a7a97f7ebda7a99ab20e255d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-18 12:59:16 +00:00
Orgad Shaneh
b6de2d1bd8 QmlDesigner: Remove unneeded qualifications 
Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: I492792bb9e5655c55795e938031efc557c9a462f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2015-02-18 09:53:25 +00:00
Robert Loehning
0c0b0c2f45 Squish: Update DiffEditorWidget in objects.map 
Change-Id: I7c3a1f85a379afcc48189b38da20fa63adaa7531
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-17 12:22:28 +00:00
Adam Strzelecki
425811291d C++: Basic support for C++11 user-defined literals 
1. Extends lexer so digit or string can be followed by underscore '_' and
   alphanumeric defining literal.

2. Extends parser so it accepts operator"" _abc(...) user-defined literal
   definition.

3. Adds Token::Flags.userDefinedLiteral bool flag field representing if token
   carries user-defined literal.

4. Adds C++11 auto tests case with: 12_km, 0.5_Pa, 'c'_X, "abd"_L, u"xyz"_M

5. All optional suffix scanning methods now return boolean if the suffix was
   found.

6. Adds C++ Lexer tests for user-defined literals with C++11 feature enabled.

This change however does not make QtCreator understand user-defined literal
semantics, e.g. properly resolve type when applying custom literal operator.

Change-Id: I30e62f025ec9fb11c39261985ea4d772b1a80949
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2015-02-17 09:45:34 +00:00
hjk
5699991a2f Debugger: Remove traces of old autotests 
Dysfuncional for a while and mostly replaced by tst_dumper.

Change-Id: I8266f2a680be23bd37d29233b91ce5a9a151163b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-17 08:34:59 +00:00
Eike Ziller
45e544b442 Merge remote-tracking branch 'origin/3.3' 
Change-Id: I79fac4a4e8535153da1b3f73a6b1caad1513ea9c
 2015-02-16 12:35:54 +01:00
Robert Loehning
0352e54253 Fix copyright headers in Python files 
Change-Id: Id2c60eae52d315b8b133512d978598d1bc187b43
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-02-13 16:52:03 +00:00
Orgad Shaneh
88e7f935f4 ProjectExplorer: Use FileName for Node::path 
Change-Id: I4a41cfb629be8bb06b4b0616cd4475525e617a51
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-02-13 13:14:03 +00:00
Robert Loehning
033a628cdc Squish: Updates for renamed template 
Change-Id: Ic5a3fad69d8fb2875b7578cb58c8f3203678531a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-13 12:37:10 +00:00
Eike Ziller
56aadc407d Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
 2015-02-12 17:36:29 +01:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01:00
Robert Loehning
28971701fd Squish: Don't rely on progress bars when parsing qbs project 
Task-number: QBS-746
Change-Id: I316934884432953e2137d7e97b73fce352be4cac
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-12 12:25:46 +00:00
Robert Loehning
e11caa793a Squish: Remove outdated code 
Change-Id: I765374645bb6176028416e7ad8e4ce69df65723d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-12 10:45:44 +00:00
Nikolai Kosjar
921ec6da5a C++: Cache parsing of template ids 
...in order to stop memory intensive parsing for invalid code.

Parsing the test data/snippet "hard" led to a memory consumption of
about 5.5MB and this could easily get up to hundreds/gigabytes by adding
some more "if_<bool_<true>,\n" lines. With the caching, we are at about
1.0MB, even if more lines are added.

The "memory consumption" was measured with valgrind-massif. The stated
numbers are the reported peaks.

Task-number: QTCREATORBUG-12890
Change-Id: Ie7eb00cfc7915552d29bb27410a6b13a486f486e
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
 2015-02-12 10:40:14 +00:00
Nikolai Kosjar
ae3aa07c4d C++: Remove workaround for crashing if parsing invalid code 
This reverts the changes

    commit beac7b9539
    C++: Fix highlighting after "invalid code"

    commit 78ab287fc6
    C++: Stop parsing a declaration after two tries

which were a work around for QTCREATORBUG-12890.

A follow-up patch provides a proper fix.

Task-number: QTCREATORBUG-12890
Change-Id: I2650a8e41c8ff1180cad9f069e463fc51bd2f1b1
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
 2015-02-12 10:39:51 +00:00
hjk
9df463da84 Debugger: Convert bb extension to use runCommand 
Change-Id: I528c51d2b02dccd91429778ef8c940fe5565345f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-12 10:27:33 +00:00
hjk
875d889082 Debugger: Move bbsetup over to runCommand() 
Change-Id: I0a19b28d24cb570651ea84bf7cdbc9a761f85a0b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-12 07:19:48 +00:00