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

1195 Commits

Author SHA1 Message Date
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
b2eab46164 Squish: Fixed tst_qml_editor 
line change missing from 39103dee4f

Change-Id: Ie299da6b31222def53e88e82cdab2adb9f451b02
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-06-20 15:32:16 +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
Robert Loehning
69da367a39 Squish: Enabling WELP03 on Windows. 
Change-Id: I3fb14d07b1f2b18b5486738a604a8ba9e0f89eb7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-06-19 18:07:19 +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
Robert Loehning
3bf4850723 Squish: Added qmake to readme 
tst_cmake_speedcrunch expects it

Change-Id: I4a192e47dc1007e969c0d8295044f3aa38f88d7b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-06-13 17:21:07 +02:00
Christian Stenger
7940377312 Squish: Fix tst_basic_cpp_support 
Change-Id: I4094e747e6090d119103cb554bc11ef3d3ffbfc4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-06-12 14:18:15 +02:00
Robert Loehning
c2061eaae9 Squish: Updated paths to Harmattan Qt version 
Paths change when updating or freshly installing the Qt SDK.

Change-Id: I18c3e5ea86be4f0ad3522cfd6e19c09b57ea56c7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-06-11 15:42:33 +02:00
Christian Stenger
9e4fa5e29e Squish: Fix installLazySignalHandler() registration 
Change-Id: I3bab865726feedc6df54ad852d4aaf5f3bc1460d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-06-10 09:21:09 +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
b3dd4db044 Squish: Handle files located inside HOME or subfolders 
Change-Id: I31e00cbf00e07749cf8e54732ec6cdbf623e44dd
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-06-07 13:57:46 +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
Christian Stenger
322853ec69 Squish: Don't let test run into ScriptError... 
...if former verification already fails.

Change-Id: I0a5d60f6a91158ed1decdedd8aa7e98ac047a44b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-06-07 09:54:49 +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
Christian Stenger
867068c479 Squish: Fix tst_modify_readonly 
Change-Id: I31b7624ecab6d2d03c5ec6bd36e790a222c1deaa
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-28 12:58:09 +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
70709f7670 Squish: Added test for session handling 
Change-Id: Ie177c4f86bb09e14c26babf63127d48871c09cfb
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-23 17:33:10 +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
Christian Stenger
ee9ec5a4d0 Squish: Correct shebang locations 
Change-Id: I5af2abaff10dc4095d6cf35350068ca08742b6ab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-16 09:24:07 +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
Robert Loehning
bbee7310c1 Squish: Remove workaround 
Change-Id: I8c42ae2d67a2eac292c4c1ca4de75ec59b060ec3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-15 12:22:20 +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
Robert Loehning
4255ec2df6 Squish: Corrected verifyBuildAndRun() 
...to deal with the behavior described in QTCREATORBUG-9212

Change-Id: Ic69098be5a09fe6aa85c40218483c2d679584ab3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-07 18:36:32 +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
Christian Stenger
e0b7cd6b03 Squish: Added timeout for waitFor() 
Change-Id: I9d15d03c9b289f41830a57ed659264a324338cc6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-06 12:35:30 +02:00
Christian Stenger
cc765472d2 Squish: Use readFile() if possible 
Change-Id: Ia850e624f24dd57589d7276af22aef1498c3c799
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-06 12:35:20 +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
Christian Stenger
f3056f04b2 Squish: Fix script for multiline strings 
If object names are scattered across multiple lines the
script failed to get the whole object name and failed therefore.
This patch corrects this behavior.

Change-Id: Ia97e2577162b77ae1b72fdd51dda4c74c59abe25
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-26 09:10:51 +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
Christian Stenger
c4aad3ef79 Squish: Cleanup tst_simple_debug 
Change-Id: Ie74b0dd42d14e594e436408e39db20554904b84e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-23 16:11:28 +02:00
Christian Stenger
1f5b3ed670 Squish: Cleanup tst_simple_analyze 
* workingDir should not be global
* handle missing Qt Creator plugins on startup

Change-Id: Ibb8267da9d3443104f6d895ff98b6047f693284e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-23 16:11:16 +02:00
Eike Ziller
38b61177f6 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692
 2013-04-23 11:13:25 +02:00
Christian Stenger
a50f4073c8 Squish: Improved QmlProfiler test 
Change-Id: I2ad50fac22a02de79643eb4d8a06c8736bb8539c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-22 14:12:16 +02:00