feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
20,620 Commits 108 Branches 368 Tags
b6835eaa8032d454eecedae5669a29f0e6c52f2c
Commit Graph

20620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hjk
b6835eaa80 dumpers: fix two regressions in std::string and general pointer checking 
Change-Id: I971ff4ad425e291c3536bc25ae6ee4933e46a681
Reviewed-on: http://codereview.qt.nokia.com/3957
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-31 13:46:05 +02:00
Daniel Teske
fb80782577 Reduce the directories plugins are searched in 
Don't search in the mac directories on linux/unix and vice versa.
Orginal patch by Ray Donnelly <mingw.android@laptop.com> on the android
branch.

Change-Id: I57a4d83a94f28bbe00609fd1b9170629da27334e
Reviewed-on: http://codereview.qt.nokia.com/3949
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-31 13:38:10 +02:00
Daniel Teske
56bf68422b Export Qt4ProjectManagerPlugin::MakeStep 
Fixes the wrong exporting in a838d4ac01

Change-Id: I3a56510f6821dd621a099d0345882264527e1059
Reviewed-on: http://codereview.qt.nokia.com/3948
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-08-31 13:10:06 +02:00
Leandro Melo
f235f2594b C++: Export DiagnosticMessage 
This is now necessary due to the recent change
that added the non-inline operator==.

Change-Id: I62255ddeb09f1e312a802db9733575e73ea56478
Reviewed-on: http://codereview.qt.nokia.com/3928
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-08-31 11:52:57 +02:00
Shane Bradley
d7ac11ea51 qttest: Invalid information shown in test output field 
Change-Id: I58d8702b0440566f67074e51a8c4ab74e74b8a48
Reviewed-on: http://codereview.qt.nokia.com/3905
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-08-31 11:48:12 +02:00
Christian Kamm
9f7a2194f7 QmlJS: Fix infinite loop when scanning for exported C++ types. 
Setting extra diagnostics would call updateDocument which would in turn
trigger another scan.

Change-Id: I3810a380cdf716a12767d94ff82dc30f8ae3954d
Reviewed-on: http://codereview.qt.nokia.com/3917
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-08-31 10:53:21 +02:00
Christian Kamm
7bc8dd18a3 QmlJS: Ensure the C++ model manager is available before using it. 
Change-Id: I0cc4e59505a6a5baa585e3748fdf174805d661b1
Reviewed-on: http://codereview.qt.nokia.com/3913
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-08-31 09:23:18 +02:00
Robert Loehning
0e784e8178 Avoid warnings from MSVC 2008 
Change-Id: Id8f75c19c8a6609e74900a71013c2fbbdbb3669a
Reviewed-on: http://codereview.qt.nokia.com/3677
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Shane Bradley <shane.bradley@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-31 08:10:22 +02:00
Christian Kamm
9f1c294dd4 C++ preprocessor: Fix multiline tokens in ifdef'ed out blocks. 
Change-Id: If6f9819565f891e861f9e111423d99caa7c0f7aa
Reviewed-on: http://codereview.qt.nokia.com/3884
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-08-31 07:41:32 +02:00
hjk
6e877ec8ab utils: make QTC_ASSERT output compatible with outputpane parser 
Change-Id: Icdb423ec16b06538446aac4d248726dae8af97f1
Reviewed-on: http://codereview.qt.nokia.com/3874
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-30 16:02:17 +02:00
Eike Ziller
57ae91c5ef Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	doc/qtcreator.qdoc
	qtcreator.pri

Change-Id: I8b34546dccc031aeeeab03417e9bd3aa7b740472
 2011-08-30 15:59:07 +02:00
Christian Kamm
90a7786dde QmlJS: Change default semantic highlighting colors. 
Done-with: Carsten Owerfeldt

Change-Id: I4705a4e35bd0bbd73200332d86854dbd34cb70c4
Reviewed-on: http://codereview.qt.nokia.com/3877
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-08-30 14:52:52 +02:00
Christian Kamm
2c7a1104fa C++ semantic highlighting: Report uses sorted by line. 
This moves sorting from the gui thread to the future and
allows the incremental application of the extra formats
to assume chunks are sorted.

Change-Id: I38e179e573c43cc955cce820f17ac87e3300a839
Reviewed-on: http://codereview.qt.nokia.com/3869
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-08-30 14:50:52 +02:00
Leena Miettinen
3bf56256d3 Doc: add source for Transitions example 
Change-Id: I20e477be4cad782dac3946f18c3067a45579388e
Reviewed-on: http://codereview.qt.nokia.com/3816
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-08-30 13:15:12 +02:00
hjk
ec12eac87d modeltest: compile fix 
Change-Id: I1c10d8cdf21e4cbd32d4cd84d14247e7f84b1cce
Reviewed-on: http://codereview.qt.nokia.com/3876
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-30 12:48:07 +02:00
hjk
e978dce852 debugger: remove some old test code 
Change-Id: I899cc0ac4e130ceeb08c474ee255fbe2613c2e6b
Reviewed-on: http://codereview.qt.nokia.com/3875
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-30 12:47:53 +02:00
hjk
6a8a786472 qttest: compile fix with namespaces 
Change-Id: I2ea20b66fc68e6d3084e1c8b184d47df7ca49177
Reviewed-on: http://codereview.qt.nokia.com/3873
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-30 12:40:50 +02:00
Christian Kamm
94a00259ac C++/QmlJS: Warnings if C++ based QML type detection fails. 
Change-Id: I1e206e09c4068cc541978ee148f9ed8c4138c249
Reviewed-on: http://codereview.qt.nokia.com/3579
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-08-30 12:03:34 +02:00
Christian Kamm
2c7729eeac QmlJS: Scan for '// @uri Foo' annotations next to qmlRegisterType. 
Change-Id: I9586bfd9f048005d62368a02a314ded924cb7254
Reviewed-on: http://codereview.qt.nokia.com/3482
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-08-30 12:03:23 +02:00
Christian Kamm
650b280b30 QmlJS: Ensure project infos are removed when a project closes. 
As a side effect, this removes parse errors of QML files that are no
longer in any project from the "Build Issues" list.

Change-Id: I7aef8850a207ac060648dc92e2dd759108b71731
Reviewed-on: http://codereview.qt.nokia.com/3668
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-08-30 12:00:44 +02:00
Roberto Raggi
c264f5b23c Regenerate the default AST visitors. 
Change-Id: I429c9d454a1b896abf642225ef7b506481fac708
Reviewed-on: http://codereview.qt.nokia.com/3867
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-08-30 11:13:00 +02:00
Roberto Raggi
27aee5dcd2 Added code generators for ASTVisitor.h and ASTMatcher.h 
Change-Id: I9d18224699034150eee13249ec90e0747afe0814
Reviewed-on: http://codereview.qt.nokia.com/3866
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-08-30 11:12:48 +02:00
Christian Kamm
13a2e49dda C++: Set property on CppEditorWidget when in function link. 
To allow FakeVim to pick up on the state and pass through Enter/Return.

Change-Id: Ia203a1b3fa8877d90cbaf4b46183bb01a6de1362
Reviewed-on: http://codereview.qt.nokia.com/3856
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-30 10:20:10 +02:00
Christian Kamm
9c1cb774a1 QmlJS: Improve ModelManagerInterface API, add docs. 
Change-Id: Ic65d767cbad85de89dffaac66d9e80d8d467f04a
Reviewed-on: http://codereview.qt.nokia.com/3851
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-08-30 10:17:32 +02:00
Christian Kamm
930e7b711d C++ insert def: Insert next to surrounding definitions. 
Change-Id: I1bef659084727d7fe69670c991ee5efe2be66497
Reviewed-on: http://codereview.qt.nokia.com/3713
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-08-30 09:03:08 +02:00
Tobias Hunger
bd23f630ca Fix warning 
Change-Id: I21d6ec20ba32c8572b68fd7e5eeadbc49abe74c4
Reviewed-on: http://codereview.qt.nokia.com/3821
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-08-29 17:39:19 +02:00
Tobias Hunger
b941eda73d Remove test of Qt4 project loading 
This test is broken for a long time now and the squish tests cover
this functionality.

Change-Id: I5ec598da8d2b9fec304a6df76509fa66318a6c2b
Reviewed-on: http://codereview.qt.nokia.com/3820
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-08-29 17:37:12 +02:00
Eike Ziller
c4ab643d76 Show more useful error dialog in case of plugin errors. 
Task-number: QTCREATORBUG-3940

Change-Id: I9e12ad68bba9c2f0d8f5243ab7dc763765fba756
Reviewed-on: http://codereview.qt.nokia.com/3811
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2011-08-29 16:49:52 +02:00
Daniel Teske
eaadc7d3f1 Make CMake Open Project Wizard bigger 
Task-number: QTCREATORBUG-5788
Change-Id: I45f54faff6efa7d7a877efc877191dd8ce85c3f9
Reviewed-on: http://codereview.qt.nokia.com/3810
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-08-29 15:59:28 +02:00
Daniel Teske
d6c089e311 New project wizard: Make it clearer that it is added as a subproject 
Task-number: QTCREATORBUG-5936
Change-Id: If06f69184f2e2754c630c7b015c78b40a9278dc1
Reviewed-on: http://codereview.qt.nokia.com/3806
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
 2011-08-29 15:51:03 +02:00
Christian Kamm
57520c44ea TestPlugin: Fix crash with non-identifier qualified names. 
Think Foo::operator+().

Change-Id: I0c8d7d4d8b952b405652d0c26b16d7a9da2e419c
Reviewed-on: http://codereview.qt.nokia.com/3739
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-08-29 14:37:38 +02:00
Leena Miettinen
bc7abeb602 Doc: update screenshots and UI text to match Qt Simulator 1.2 
Change-Id: I1d05e82ffdd17b89963aa4d1ebde4d47d8dffb7f
Reviewed-on: http://codereview.qt.nokia.com/3736
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
v2.3.0 		2011-08-29 13:56:14 +02:00
Friedemann Kleint
94d034b803 Quote arguments in krazy2tasks, add usage. 
Change-Id: I992c0e72c41d1c82788ef096c7d0b4433b6ce148
Reviewed-on: http://codereview.qt.nokia.com/3726
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-08-29 13:13:52 +02:00
Bill King
f4ba61528e Remove the need to set global scripts directory. 
Change-Id: I8f937120f7b151b0c68480a898fd953ae542bf69
Reviewed-on: http://codereview.qt.nokia.com/3662
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-08-29 12:36:31 +02:00
Friedemann Kleint
c952834ff2 Fix krazy warnings/some includes in qttest. 
Change-Id: I4c11aa5977efb3fa726e8394bec25c86a6fe049f
Reviewed-on: http://codereview.qt.nokia.com/3725
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-29 12:18:44 +02:00
Robert Loehning
662c66ef6b Moved class FileUtils out of Internal namespace 
...because it is being exported.

Change-Id: If2892f8455b7c7fb9a78a8cde27642901ae4bf3a
Reviewed-on: http://codereview.qt.nokia.com/3676
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-29 12:17:31 +02:00
Eike Ziller
9e0fc18fba Add some info about namespaces 
Change-Id: I6e3c2900b3f3c96e4b9f6657f9371fd728e5bd91
Reviewed-on: http://codereview.qt.nokia.com/3722
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-08-29 12:11:17 +02:00
Joerg Bornemann
b6f62d69b2 use struct initialization instead of ZeroMemory in process_ctrlc_stub 
Change-Id: I8fa85c7a861e9f3f4067d12c894b0a1d30541eb5
Reviewed-on: http://codereview.qt.nokia.com/3675
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
 2011-08-26 17:02:55 +02:00
Friedemann Kleint
57ae675e01 Fix compiler warnings/some string handling in qttest. 
Change-Id: I593ee69bed193fdd1b1f9aa49da02bf77aaca523
Reviewed-on: http://codereview.qt.nokia.com/3674
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-26 16:47:44 +02:00
Shane Bradley
82427fe4fd Adding test support plugin to Creator. 
The plugin adds a navigator pane which shows a tree of all tests
'found' in the project, as well as Test Result output panes.
Tests can be edited in an editor and executed from within the IDE.
This is the first in a series of commits, ending with documentation.

Change-Id: Iee91cf991810347cb2f3a428f7457ea75e0c5b57
Reviewed-on: http://codereview.qt.nokia.com/2020
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-26 13:14:40 +02:00
Eike Ziller
9c72215147 Set a category. 
Change-Id: I2a17cc8aba675d817d4f4f62bfcce4e249427a41
Reviewed-on: http://codereview.qt.nokia.com/3655
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-08-26 13:06:25 +02:00
Kai Koehne
f1f1136259 QmlProfiler: Stop app if you cannot connect 
No reason to let the app running when we've already told the
user that we cannot connect.

Change-Id: I35cd7ec2523af07cb2256aa96d5f3ebb96752ac2
Reviewed-on: http://codereview.qt.nokia.com/3661
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-08-26 12:49:02 +02:00
Kai Koehne
0702e8a3b5 MobileWizards: Rename MaemoPngIcon to just PngIcon 
Change-Id: I3aa1f0eb3d2a894ba816c0d055d847a21f71da27
Reviewed-on: http://codereview.qt.nokia.com/3110
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-08-26 12:47:22 +02:00
Kai Koehne
93df6f9534 QmlProfiler: Store type of event as string instead of number 
This makes the .qtp files slightly more readable.

Change-Id: I2642cf9b7ff43730559088c6ac710545e2b2a47e
Reviewed-on: http://codereview.qt.nokia.com/3654
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-08-26 12:42:07 +02:00
Christian Stenger
648e985cd6 Improved check for last build status 
Change-Id: I18f8839daeb5f21957b9ab8102341f25dd77720d
Reviewed-on: http://codereview.qt.nokia.com/3651
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-08-26 12:21:20 +02:00
Tobias Hunger
059e5f30de Symbian: Warn if EPOCROOT is on different drive from the sources 
... even when using SBSv2

Task-Number: QTCREATORBUG-5907
Change-Id: Ibb79dc798b8146f9e5658e186f499bfd47fb3d9e
Reviewed-on: http://codereview.qt.nokia.com/3660
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-08-26 12:11:48 +02:00
Bill King
756fb87983 Initial commit of squish tests for creator. 
Change-Id: Ic499b3c36d37f9789276f60a41642ffc7ee816d1
Reviewed-on: http://codereview.qt.nokia.com/3047
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-08-26 09:46:31 +02:00
Christian Kamm
3dcf168165 C++ function link: Disable function links on name change. 
Change-Id: Ib5e3a3a381568347a7a465f956f7daad15f10ab0
Reviewed-on: http://codereview.qt.nokia.com/3596
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-26 08:47:36 +02:00
Friedemann Kleint
bd5a1a9bce Extract Core::TextFile from TextEditor::BaseTextDocument. 
Use it in BaseTextEditor and Designer to preserve CRLF
of the files.

Task-number: QTCREATORBUG-5901
Change-Id: I7599ce78649a3b09f2e5118d02f8cbf3db27ed31
Reviewed-on: http://codereview.qt.nokia.com/3591
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-08-26 08:23:16 +02:00
Daniel Teske
e29881015d Fix BaseQtVersion::qmlViewer and others with qt 5 
Task-number: QTCREATORBUG-5254
Change-Id: Ic25378dbfed5c55a4f09e1fbd5d99c313dac4cf8
Reviewed-on: http://codereview.qt.nokia.com/3611
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-08-25 19:05:38 +02:00