feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
44,951 Commits 108 Branches 368 Tags
fd83c50599b52d0fa07901b7709d0ad6f562e0c0
Commit Graph

114 Commits

Author SHA1 Message Date
Robert Loehning
52bff97cfa Squish: Replaced lot of signal code by one simple function 
Change-Id: Idb6b663a8b2be217d8769fab5e2f6f9290f37990
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-01-22 10:13:02 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Robert Loehning
f5ec3f4237 Squish: Make some variables local 
Change-Id: I1687ae59c6327616ee18f6120dca9d0d0ce40bcf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-01-07 15:24:57 +01:00
Christian Stenger
cae7802902 Squish: Add missing envvars files 
Change-Id: Ifecd94b1b9ef8d3833474a45a258f219ceb9f86b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-12-12 13:05:13 +01:00
Christian Stenger
f04870647f Squish: Remove workaround for fixed bug 
Change-Id: Ib6a47fbab85835fd33424134fefca153a3595d6b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-12-12 13:05:04 +01:00
Robert Loehning
d39ac6bf3c Squish: Use keyboard interaction instead of textCursor manipulation 
Change-Id: I40f27c7b542f512de78ea2e7fa6e777b652edc4a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-11-27 15:43:56 +01:00
Christian Stenger
924a45dc89 Squish: Fix tst_basic_cpp_support 
Replace waiting for signal textChanged().

Change-Id: I40feb7d49310d4aa9fae4ca4256e9ce2d0f2ab4d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-11-22 17:11:39 +01:00
Christian Stenger
7912071b6f Squish: Fix tst_qml_indent 
Replace waiting for signal textChanged().

Change-Id: I0798f0ef2e1162d2a2b09da98e53dd8fc50e0a7a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-11-22 16:15:40 +01:00
Christian Stenger
4b4e5f6990 Squish: Qt Quick [12] Application templates are merged 
Additionally there is no more a way of creating a Qt Quick application
from an existing qml file.

Change-Id: I5c1e8d26640fa3e1b865b6cc97745d64b51edc75
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-11-22 16:04:10 +01:00
Robert Loehning
8429f1744b Squish: Stabilize tst_basic_cpp_support 
Change-Id: I3570ea653dd6b4d164d896f5c4617ddb910698d7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-10-31 16:52:05 +01:00
Robert Loehning
95828d4691 Squish: Handle differences between Qt 4 and Qt 5 
Change-Id: I529d5cbd017f7d17fbe2f38fc539583e96d835cf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-27 12:28:23 +02:00
Eike Ziller
63ff745213 Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
 2013-09-27 10:44:32 +02:00
Robert Loehning
76cfe9e30e Squish: Update expected window title in tst_basic_cpp_support 
Change-Id: Ic5d23a899d1b808780f76ef53c855397cc436c2f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-20 10:59:51 +02:00
Robert Loehning
e29ae8c537 Squish: Fix usages of :OpenDocuments_Widget 
Change-Id: I1dde01e3fc8fb5f696054f72c44bdc9387aad5c6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-18 16:00:19 +02:00
Robert Loehning
b0f18491c9 Squish: Added alternative color values to tst_qml_editor 
Change-Id: I00b7df0c33fc6553fe3dc3364c6bc4dc448d72a7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-18 11:56:22 +02:00
Oswald Buddenhagen
a4d714e23d Merge branch '2.8' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	tests/system/shared/project.py
	tests/system/suite_general/tst_create_proj_wizard/test.py

Change-Id: Id9b80f049143dc8e108ed90bdc7c1ab40ba829ef
 2013-09-06 12:20:44 +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
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
Robert Loehning
732f8a06ae Squish: Update for changed window title in Creator 3.0 
Change-Id: I669e4822ea99bab22afe229d8dc822bc7ffc4550
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-18 16:10:23 +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
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
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
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
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
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
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
180b48003f Squish: Added copyright headers 
Change-Id: Icdf2f31f73e8b6eed75954ad31d12d48e00109b5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-15 13:35:01 +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
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
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
Robert Loehning
f694b04b68 Squish: Replaced duplicate bugreport 
Change-Id: I73bc3a633e47ddd0580976dd355da323e2426b4f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-04 11:30:01 +02:00
Robert Loehning
003821f936 Squish: Prepare tst_CCOM01 for Qt5 
Change-Id: Ic2806673cb65018000bcbe6ae66dad1b2f555e39
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-28 18:57:43 +01:00
Christian Stenger
7c4478c4b9 Squish: Add Mac workaround to tst_revert_changes 
If the editor had not been clicked before invoking the
Edit menu Creator does not notice that the editor has focus,
so all subitems will be grayed out.

Change-Id: If8b23fd6abae1bac6b3387e9a5394cfb4b84529d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-28 09:22:51 +01:00
Christian Stenger
c3ef30796a Squish: Add workaround for Mac issue 
Change-Id: I516afb90001864082fb32678c92215cfd4b79518
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-26 17:24:24 +01:00
Christian Stenger
07d3e712fe Squish: Replace useless signal waiting 
Since Squish 4.2.3 the signal handling has been fixed and this
signal won't be caught by Squish because it was triggered by another
object.

Change-Id: I4a849084712ee99f9e63b844f832ba8dadd793ac
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-12 17:22:53 +01:00
Robert Loehning
530b2f79eb Squish: Reduced timeouts in tst_memberoperator 
Change-Id: I0945c1752500a32b45320497e12d96fa7d8f623f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-12 12:39:51 +01:00
Christian Stenger
9734fc4f4c Squish: Fix tst_modify_readonly 
* Fix handling of modified files (if a file is read-only but not
expected as such the test crashed)
* Hopefully fix the permanent crash on the build machine while
waiting for the not expected message box while Creator shuts down

Change-Id: I84af2d25633f24256c20ada82acd9e13b743b4bf
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-11 16:01:19 +01:00
Robert Loehning
497eb16455 Squish: Make sure file was opened in tst_select_all 
Change-Id: Iad2c590fd7cc87d8267ecdca515dbef48480e9ed
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-28 17:47:25 +01:00
Robert Loehning
4d7e1c43db Squish: Tuning tst_select_all 
Change-Id: I14ba2d2eee033a6e779cd1cca47e25572020dc40
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-26 12:58:53 +01:00
Christian Stenger
86d3e075ff Squish: catch plugin loader error if it occurs 
...and stop execution of the current test case

Change-Id: I46ac21e79f643f6890b7303d08c204dcd9fa9386
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-22 16:52:13 +01:00
Robert Loehning
7c9d2e3a1a Squish: Fix invoking context menu sub items 
Change-Id: I7d498ac3d4e2e2d25b3c504a95f96e434d0d1619
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-21 13:55:45 +01:00
Christian Stenger
80263a5221 Squish: Fix some Mac/Squish issues 
Details:
* wrong shortcut usage replaced
* timing issues fixed
* re-used the editor-focus-on-mac workaround for some tests

Change-Id: Ie0d65d941c999d545bd50e1cf4794624c4110247
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-18 12:56:46 +01:00
Christian Stenger
c7ca78afd0 Squish: Revert unsuccessful fix for build-machines 
Change-Id: I47865c18ba24ce8a732046597fe27f32c4edf3e3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-08 13:15:19 +01:00
Robert Loehning
ca4b3f9d1d Squish: Wait for parsing in createNewQtQuickApplication() 
This is what createProject_Qt_GUI() and
createProject_Qt_Console() have always done

Change-Id: Iaead1767c699e4fd237d999e6f3d94d277b1d84f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-08 10:30:37 +01:00
Christian Stenger
675b33e832 Squish: Let tst_rename_macros continue if it fails 
Change-Id: If4836259220f6439e7f2cc958ecfb19b56c94573
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-04 13:55:08 +01:00
Robert Loehning
fc9ed4960d Squish: Fixed tst_qml_editor 
Change-Id: Ice53977c5d747d0e38943274e269c31c48bf14c3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-01 17:09:49 +01:00
Robert Loehning
f71486fa4d Squish: Fixed tst_modify_readonly 
Change-Id: I8cce1e72dceb1085cb42f2cfa2bf8a7db721c564
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-31 17:31:58 +01:00
Robert Loehning
0a35cae99d Squish: Fixed tst_qml_indent 
Change-Id: I9edd5410896401810b5106049832c36221b155d3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-31 16:02:57 +01:00
Oswald Buddenhagen
f1cec4629e Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
 2013-01-29 15:52:36 +01:00