feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
88,532 Commits 108 Branches 368 Tags
cc05c1637778db8210ea901b8da71aeef1bde05e
Commit Graph

832 Commits

Author SHA1 Message Date
Christian Stenger
4fc9302c56 Squish: Move common code to shared file 
Change-Id: I5e268d6faf9a2a5a779e850667c582328c42387d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:10:14 +02:00
Christian Stenger
4c0778786b Squish: Build Qml debug lib only if necessary 
Change-Id: I90cf1f9e57d39211ea151b1cfc52e27f4ecaf654
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:09:58 +02:00
Christian Stenger
4433f7aadd Squish: Enable running on Qt5 
Change-Id: Id74f1f2162542cbac98f86bc0c0b049334cdf035
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-28 09:21:34 +02:00
Oswald Buddenhagen
c2e90c360b Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
 2013-08-21 14:39:18 +02:00
Robert Loehning
01b3e1fa54 Squish: Fix __startDebugger__() 
Change-Id: I1f87346ad12f4a6e749042b3c1bcabbc71bdbf7a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-08-21 11:01:42 +02:00
Christian Stenger
a932c6ebca Squish: Improve invokeMenuItem() 
Change-Id: I977a9465a944f30fc195e6072f50b663f5d4d24d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-13 09:23:34 +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
Robert Loehning
2001fe982b Squish: Moved code from aptw.py to build_utils 
Change-Id: Id42cc45e9cb4a8a3aa43086ae3a427143617927c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-23 15:19:17 +02:00
Robert Loehning
3897137b0a Squish: Updated tst_create_proj_wizard 
Change-Id: I04bfd317ce85f764f97d341b46b20264976ef9bd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-19 16:02:15 +02:00
Robert Loehning
8050e136e7 Squish: Added kit "Desktop 480 GCC" 
Change-Id: I20296f8819837fd613c6328d6c19fc8be82927b3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-15 12:42:18 +02:00
Robert Loehning
756222f28e Squish: Expand tests to python editor 
Change-Id: I1c3062f2802531d7a6e2f3c2b75645432ba364a4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-11 16:59:07 +02:00
Christian Stenger
97a6ee9685 Squish: Added test for checking locals 
Change-Id: I8c676982d335c772a5911cab23a52acb2a094ed1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-07-11 09:16:20 +02:00
Christian Stenger
702402a638 Squish: Avoid false positive warnings 
Change-Id: I6cf15b571aae9a1ba4dcd02048e7ca6b21fab1da
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-07-08 16:15:34 +02:00
Robert Loehning
6dd6ce935e Squish: Handle Squish installation path with spaces 
Change-Id: Ia988ceaeab83d3b1b5258024f9c4ee5232eaf43c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-04 15:42:50 +02:00
Robert Loehning
fbdbd11aa3 Squish: Added note about possible problems with netsh 
Change-Id: Ic54abb4d014b8eaf71cbda490e5b4206dbb3da3b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-03 15:05:03 +02:00
Robert Loehning
c0272c7919 Squish: Updated used MSVC Qt versions 
Change-Id: Id44c5715c48feeeec0c10a029556c25658e70e72
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-06-24 12:57:30 +02:00
Robert Loehning
89225167fb Squish: Removing now unused constant defaultQtVersion 
Its use was being removed in 6078d7e028

Change-Id: Ib27d7e9a7596fc6358edc1e4a09962951d105752
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-06-21 18:01:25 +02:00
Robert Loehning
66a1b52f98 Squish: Stabilize progressBarWait() 
Change-Id: I9511317f8389963e5c98230d6885311a84c2dc25
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-06-20 14:00:53 +02:00
Robert Loehning
648403d439 Squish: Fix handleDebuggerWarnings() 
Warning now shows up for MSVC builds, too.

Change-Id: I774079fd6ee0f9bf70a7f37c9920dd45e55154d0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-06-20 13:54:04 +02:00
Christian Stenger
39103dee4f Squish: Fix WELP03 
Examples from Welcome Page can be used from Qt4 or Qt5 now and
Qt5 examples are chosen by default.

Change-Id: I2b94214b3fd12b56143ed3ea1026466ae7ffa0f3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-06-19 17:07:56 +02:00
Christian Stenger
94987b2f5b Squish: Another snooze() for selectFromFileDialog() 
Change-Id: Ibc24c27a8e69ba7eb039618ea416b2e84da6e617
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-06-18 13:13:50 +02:00
Christian Stenger
613d3c563a Squish: Make sure self._fix is not used undefined 
Change-Id: Iee34668ed77df9625fbc3b4fed13a903f2746099
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-06-17 15:27:45 +02:00
Christian Stenger
c8b478f0bd Squish: Stabilize invoking tab item widgets on Mac 
Change-Id: I16a61c1215d64243238a4cfbee007a78c282eb4c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-06-07 15:33:55 +02:00
Christian Stenger
a83a40d7af Squish: Added verification to selectFromCombo() 
Change-Id: I694163aeb7a588618207ec4064f93658e25e1917
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-06-07 09:54:57 +02:00
Robert Loehning
e259196593 Squish: Update handleDebuggerWarnings() 
Change-Id: Ifd0a9270f84abe15603cbf80ef18eb7450436c74
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-05-29 14:58:50 +02:00
Christian Stenger
7bb64a58f4 Squish: Move simpleFileName() into shared script 
Change-Id: I359af17fcbc67149fab4e291142523b436a43832
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-29 09:16:33 +02:00
Christian Stenger
d007681b31 Squish: Improve changePermission() 
Change-Id: I3ce1691afc2fad3949d216dee37b06a33e40f6f1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-29 09:16:25 +02:00
Robert Loehning
3b46f64272 Squish: Updated handleDebuggerWarnings() 
Change-Id: Id5129e6797b945c16ecafad92f0d00bd0edeb3cd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-28 12:10:32 +02:00
Christian Stenger
5deb6644a4 Squish: Fix strange infinite waitFor() 
This caused WELP02 to wait forever on one testing machine although
running fine on local and other testing machines.

Change-Id: Ie66c3197f63f6f3224993107d039b0cf4b817483
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-23 17:33:18 +02:00
Christian Stenger
3590eed886 Squish: Clean up before and after Qml debugging 
Change-Id: I592842964984b51669b773a9af1fdd81df032f7b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-23 17:32:52 +02:00
Eike Ziller
ef5d3796d5 Merge remote-tracking branch 'origin/2.7' into 2.8 2013-05-23 07:25:34 +02:00
Robert Loehning
f7ac7fb241 Squish: Updated createNewQmlExtension() 
Change-Id: I4739794a78fee1c347e2b63f46883f161140d360
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-17 16:35:45 +02:00
Robert Loehning
e5d6decccc Squish: Updated hook_utils 
Change-Id: I7d2f43a9283f5b8a3edff4888a6b8c3eac076038
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-17 16:35:36 +02:00
Robert Loehning
180b48003f Squish: Added copyright headers 
Change-Id: Icdf2f31f73e8b6eed75954ad31d12d48e00109b5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-15 13:35:01 +02:00
Oswald Buddenhagen
6fb94a7b10 Merge branch '2.7' 
Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
 2013-05-15 10:21:47 +02:00
Robert Loehning
3cafcba19a Squish: Updated progressBarWait() 
Change-Id: I81381dba6b0653a550a7362743939e7b943a9f00
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-15 10:12:02 +02:00
Christian Stenger
8ca5b55a0b Squish: Prepare re-usage of batch editing... 
...of the environment variables for the next run.

Change-Id: Iaf383dfa361971c75be0e180d72ab95c5df83ebe
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-15 08:59:16 +02:00
Christian Stenger
edf8b4a59b Squish: Stabilize invoking context menu items on Mac 
Change-Id: I64ed356b6120c38d51c646ae409bbbc3a4fe9e8e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-06 12:46:18 +02:00
Eike Ziller
a2171c2d82 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
 2013-05-03 09:49:28 +02:00
Robert Loehning
c8984dc58a Squish: Using progressBarWait() instead of waitForSignal() 
Change-Id: Ia87569c080f3b54dd8f78b023408de76eb3c574c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-02 10:13:19 +02:00
Eike Ziller
bedc477943 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
 2013-04-30 11:43:33 +02:00
Robert Loehning
e793779589 Squish: Added test for renaming files 
Task-number: QTCREATORBUG-8335
Change-Id: Ie9ca9018194c955f099b7d99ab46ba26303e354d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-25 16:12:46 +02:00
Christian Stenger
d799bf31be Squish: Changed handling of workarounds 
If a bug is closed for master but still valid for the current working
branch the workaround won't be executed if started with
performWorkaroundIfStillOpen(). This leads to wrong results.
The new approach is less automatic but more error-proof.

Change-Id: If33c920be08e33c0fb2ccc4faec4ae8ff0d0f95d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-25 12:39:50 +02:00
Christian Stenger
ba6cc1d04f Squish: Cleanup workarounds.py 
Change-Id: Ibbdae1c85d49122928fda97ea5f3d83245eab7ed
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-24 13:20:41 +02:00
Christian Stenger
eab228dcca Squish: Cleanup workarounds.py 
* removed fetching status
* improved output for closed bugs

Change-Id: Ice0256f75571c6c44e9878447d3821247f5ded4f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-23 17:04:07 +02:00
Christian Stenger
59edc40593 Squish: Add Run button to objects.map 
Change-Id: I506a030714a46a1ca3610b18daf296deaa6bfcc2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-23 16:11:37 +02:00
Eike Ziller
44931c0985 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
 2013-04-18 09:22:19 +02:00
Robert Loehning
3fd74568b8 Squish: Updated checkLastBuild() 
Change-Id: Iebe27d2d4d08fde62398cd711ad557f16a6f3974
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-17 15:18:48 +02:00
Robert Loehning
0a79a50d06 Squish: Fix cleanup gone wrong 
Change-Id: Iebd03914a2abcfa014288f82360687f18d6bacd9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-12 18:14:34 +02:00
Eike Ziller
9ff8979da3 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/cpptools/cppchecksymbols.h
	src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp

Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
 2013-04-11 18:27:52 +02:00