feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,174 Commits 108 Branches 368 Tags
b8e1860c885fe3e7cb901b96c3303dd9d70ea26c
Commit Graph

31174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Orgad Shaneh
60fa56db8e Git: Initialize remote model directory even when no remotes found 
Task-number: QTCREATORBUG-9789
Change-Id: If3626e244b9d85ad670d586438710e17bba8e927
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-29 10:33:18 +02:00
Orgad Shaneh
044a78f750 Git: Support remotes with whitespace on url 
Task-number: QTCREATORBUG-9789

Change-Id: Id501ade0ac2ce7093fa38368f13b2bfab31bd35f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-29 10:32:36 +02:00
hluk
b5922db843 FakeVim: Delete settings later 
Change-Id: I88fd334b7ffa22d9b42b7fde3edd4b37a525b0a2
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-07-29 10:17:05 +02:00
Orgad Shaneh
5d1d2d2b62 Git: Fix autostash for branches 
Broken by 771fe03cfe

Change-Id: Ifb629535d2197bbee771050c94952068834614f3
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-07-28 18:04:43 +02:00
Orgad Shaneh
b0283de055 Add qmlscene to qbs build 
Change-Id: I77ac542c5c826d84d74321dfe5e3e87afb4221cf
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-07-26 16:20:27 +02:00
Christian Kandeler
1f007a6264 Consolidate the different "Plain C/C++" wizards somewhat. 
We should not duplicate all wizard resources for every supported
build system -- this will not scale. Instead, have one top-level
directory for each type of wizard with build system specific data
in respective subdirectories and common data in another.
To support this approach, CustomWizard now traverses the template
directory recursively as long as no wizard specification has been found.

Change-Id: I8aad8cf36c5bf24d062f2d2c17fdb87ad12fd450
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-07-26 16:14:06 +02:00
Christian Kandeler
080277e8ae Do not offer CMake-specific wizards if that plugin is not enabled. 
Rationale:
    a) For people not interested in CMake, the wizards unnecessarily
clutter the UI. If unhandled, this problem would get worse the more
build systems we support.
    b) If such a wizard is actually used in the absence of the plugin,
nothing visible will happen after it has finished, which is guaranteed
to confuse users.

Change-Id: I070409d3185b11d2e04e33927a97843e60c657ff
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-26 15:14:02 +02:00
Leena Miettinen
78fc438372 Doc: location of generated help files 
Change-Id: Ibd2d6f86cd82e98bf9116bc9d5dc14dec1c6d058
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-07-26 13:47:34 +02:00
Marco Bubke
e9e0a4dd26 QmlDesigner: Use the global QmlModelView 
We should change that QmlModelView architecture anyway. It is not really
fitting. Maybe attach one to the model.

Change-Id: Iee041d6e1972bd2cd9040f932404feffbe5728ef
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-07-25 17:31:06 +02:00
Marco Bubke
e9c4965c91 QmlDesigner: Move setPostion and setSize to QmlItemNode 
Change-Id: I7a6e3705807651a81b1408ce4dfaea2cdda731df
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-25 17:30:00 +02:00
Marco Bubke
d27950b8b9 QmlDesigner: Remove unused code 
Change-Id: Idedc365c1cdf73f6728597b87c7a807b25581a1f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-25 17:29:52 +02:00
Marco Bubke
3a4a7ff7a9 QmlDesigner: Rename canReparent to instanceCanReparent 
Change-Id: I6b2eac40c68a01053133d623690e6ff4c2d02060
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-25 17:29:45 +02:00
Marco Bubke
8ce99eda81 QmlDesigner: Rename hasShowContent to instanceHasShowContent 
Change-Id: I32871e3a661319deefe910edf2e3cd51fbf8aefa
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-25 17:29:40 +02:00
Marco Bubke
8b20287418 QmlDesigner: Return items instead of object for defaultPropertyChildren 
Change-Id: I39a4698c187180c8a954e64a44938b1e3bb910fc
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-25 17:29:34 +02:00
Marco Bubke
90d4e38b36 QmlDesigner: Change defaultProperty in defaultPropertyName 
Change-Id: Ic00fb37878c552e8b0bb9137a2985e9af3ca7ddc
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-25 17:29:27 +02:00
Marco Bubke
4aac7343a4 QmlDesigner: Optimize hasChildren and hasResources 
Change-Id: I09a8a0e18172af8f57f0fcf6217bfd9a17a1b230
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-25 17:29:22 +02:00
Marco Bubke
7bdd69726f QmlDesigner: Improve QmlItemNode::defaultPropertyChildren() 
Change-Id: Idec9cf81437b599c4fa1322f0a856a7c3284ced6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-25 17:29:15 +02:00
Marco Bubke
95d3ce1374 QmlDesigner: Improve QmlItemNode::resources() 
Change-Id: I7cbe12a44dd4e72c84f65cc97ccd85c7340b7ed0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-25 17:28:43 +02:00
Marco Bubke
85cc4a1324 QmlDesigner: Improve QmlItemNode::children() 
Change-Id: Ie73690a5810dd35c4cd3ad9431ab12c7a3bc01cb
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-25 17:28:37 +02:00
Tobias Hunger
34e2636ef7 Gcc: Sanity check predefined macros 
Change-Id: Ib6054d4e3348a39eddfc6b41c3a530f1d4d199f0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-25 15:57:19 +02:00
Tobias Hunger
cb0ef23a55 Gcc: Make sure to not add '\n' to output needlessly 
Change-Id: I5a5d9cda5aba60cbf20b54934dde3ecdccdd99e3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-25 15:57:02 +02:00
Tobias Hunger
96b088d596 Gcc: Speed up autodetection of broken gccs 
If a gcc is broken: Do time out earlier and do not try to run it
a second time.

Change-Id: I8742e507c8aaf4b9174848555f057840ee03ad22
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-25 15:56:48 +02:00
Christian Stenger
cd30b00a54 Tests: Compile fix for dumper test using Qt4 on Win 
Task-number: QTCREATORBUG-9719
Change-Id: Ie4024a8c08e0612e3c37888c7bc45415922228af
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-07-25 15:48:55 +02:00
Aurindam Jana
2b29190c15 Qnx: Add QmlDebug dependency to qnx.qbs 
Change-Id: I70ce407e2a0aa8046c28b02a995dbd9ff7dbee4e
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-07-25 14:39:26 +02:00
Robert Loehning
a0cb66e938 Squish: Added test for QTCREATORBUG-3620 
Task-number: QTCREATORBUG-3620

Change-Id: Ibfcc1a51825b019fd834644da0344143725b0b70
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-25 14:18:44 +02:00
Tobias Hunger
2dd0344b73 Qbs: Use proper mimetype for qbs project files 
Change-Id: I88cc3b74bff44d11b019868dc40d43788c035558
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-25 14:15:01 +02:00
Tobias Hunger
2cfaa2db5b Qbs: Small header cleanup 
Change-Id: Ie8972395d7a0f2af18810954c3d8311357afd1cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-25 14:14:44 +02:00
Christian Stenger
7eb4b14370 Squish: Extend version test to manual 
Change-Id: Ia8b70c9769fc36f82170e93a751cac4bd124f997
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-07-25 13:50:43 +02:00
Oswald Buddenhagen
6896546ba5 Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/plugins/cpptools/cppmodelmanager.cpp

Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
 2013-07-25 13:18:31 +02:00
Nikolai Kosjar
e2ce17ef00 CppTools: Fix "! condition" coding style 
Change-Id: Ic7e634e4249fb64edbc2daceb65ec8e9b5f0f8b9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-07-25 13:11:34 +02:00
Mehdi Fekari
782b9994d8 Qnx:Fix broken syncCertificates() method 
Change-Id: I83e4b047ee520444629902a60ccf5c2d2dedf577
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-25 13:10:16 +02:00
El Mehdi Fekari
04c45c395b Qnx: Automatically connect to device when running an app 
Task-number: QTCREATORBUG-9839

Change-Id: Iac6e6bd8d4f16d09c82658b9cd02518ee6300e1b
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-25 12:34:47 +02:00
Aurindam Jana
1dd9a54ab6 AndroidSettingsWidget: Set JDK path 
Use QFileDialog::getExistingDirectory instead of
QFileDialog::getOpenfileName.

Change-Id: I3790f3c238434643fa304e18a42216b951a445c7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-25 12:24:44 +02:00
Mehdi Fekari
87b1ea2af7 Qnx: Properly call makeSticky(kit) interface 
Change-Id: Ib72bc1e9ced522fca702308250cc5c8f7259d4f2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-25 12:15:35 +02:00
Tobias Hunger
4e3c7b9835 Kit: Provide interface to mark individual kit information sticky 
Change-Id: Ic45aae21cb8b0f4e4fdd0dcf1009f127e489920c
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-25 12:15:16 +02:00
Nikolai Kosjar
6aceadac27 CppEditor: Fix "! condition" coding style 
Change-Id: I216b74933f5e94c49be7f05f0b09ac01b3319d8c
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
 2013-07-25 12:10:30 +02:00
Joerg Bornemann
238c4ecc14 update qbs submodule 
Change-Id: Ib8436358a16ba243564696885e1a975e2dd63556
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-07-25 12:07:58 +02:00
Aurindam Jana
0933e251ad QnxAnalyzeSupport: Notify engine when remote is running 
Change-Id: Ie91b022b7f2d14f907edb0aa3a7cb2fda9c79f4a
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
 2013-07-25 11:37:10 +02:00
Christian Kandeler
dbb1cb8484 Qnx: Fix qbs build. 
Change-Id: Ib00a9a6fdf3e4d4bcc680729a1f9d53a6349d1d3
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-07-25 10:56:17 +02:00
Christian Kandeler
c03c41a48d Qnx: Fix build with namespaced Qt. 
Change-Id: I022345594a3747a81b2301ce05609f200e9bb2f6
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-07-25 10:56:02 +02:00
Nikolai Kosjar
871c9cfd3f Tests: Fix race condition when executing plugin tests 
Usually the plugin tests are executed after the session manager
evaluated the command line arguments. This is just fine for the file and
token tests of the CppEditor (fileandtokenactions_test.cpp) since these
depend on the files and projects passed in via command line.

Running qtcreator within valgrind reverses the sequence and makes it
impossible to execute the mentioned tests. Fixed by starting the tests
after the plugin initialization is done.

Change-Id: I7cc392b7da7e0d98e0ce44edba2e3abceb84fad8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-25 09:33:17 +02:00
Oswald Buddenhagen
1964241153 don't use camelcase headers in code shared with qmake 
Change-Id: Ie71e2c53701470511763b6eb90345935cbf84a38
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-24 18:48:49 +02:00
Robert Loehning
6687b0f88b Squish: Added test for ui completion 
Change-Id: I9c668b4fe909d274c47b0519cacd3b5a73990bb4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-24 18:44:01 +02:00
Mehdi Fekari
7b313e9696 Qnx: Refactor BlackBerryConfiguration 
Improve the NDK setting page to enable managing multiple NDKs.

* Refactor BlackBerryConfiguration to support multiple configurations
* Add auto detected kits for installed NDKs
* Add/Remove manual NDKs

Change-Id: Icbc850551da3f729ccaa3473da720ade3051adaf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
 2013-07-24 18:20:23 +02:00
Petar Perisin
2ac65aaa7c Git - Add Cherry Pick in branches dialog 
Change-Id: Ic01846e3f8622cfa7b6c6ada8b626af6fa8cb3e9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-24 17:28:58 +02:00
Marco Bubke
8671bd182c QmlDesigner: Remove empty notifier from QmlModelView 
QmlModelView is abstract and should not hide other notifier.

Change-Id: Ic992829e8e62ecf6142f84251dc1a86d35e35c2d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 17:26:07 +02:00
Marco Bubke
ff9e7a00c7 QmlDesigner: Remove qml function in the QmlModelView 
Change-Id: I94748c9fad017038d61ff5a231a8e5f081985cc0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 17:26:00 +02:00
Marco Bubke
6c848f1bc7 QmlDesigner: Derive DesignerActionManagerView from AbstractView 
Change-Id: Ia0139b51d603fc0f41a3f58f557eab3a77817f98
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 16:26:38 +02:00
Marco Bubke
6fdd0e27c9 QmlDesigner: Remove empty line 
Change-Id: Id299630f696f02cf82d10f2dafdcdf8cbf6ac8d6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 16:26:33 +02:00
Marco Bubke
e5b9ff2eed QmlDesigner: Use AbstractView instead of QmlModelView 
Change-Id: I12ad584f8cdc8decb3fd4489a8b8ec820ff2be91
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 16:26:28 +02:00