Commit Graph

371 Commits

Author SHA1 Message Date
Robert Loehning
3082d5c0fd Squish: Remove pointless code
Change-Id: I8fb227301cf1375f159a8dbe3f6197cd0451d0ae
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-01-06 13:51:16 +01:00
Christian Stenger
c283ecaf57 Squish: Temporary fix for tst_installed_languages
b748c1b3d2 solved the issue for
Qt Creator running in English only. This test starts Qt Creator
with different language settings, so the app won't close properly.

Change-Id: I63b3b6c4125dc0173c4fd3b4d54c48a0d1dd9687
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-12-16 12:05:06 +01:00
Christian Stenger
9e4dc6009e Squish: Remove workaround for fixed bug
Change-Id: I0ebe8fdf19ff1e955ea8800f384d7a0f130fb253
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-12-12 13:04:44 +01:00
Christian Stenger
31e2d42dcf Squish: Fix tst_rename_file
Change-Id: I8d7f983959c1d7735a95ffde3452e8c7edf75ae1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-12-12 13:03:34 +01:00
Robert Loehning
9a661d1d1e Squish: Restrict workaround to Qt4 builds
Change-Id: Ib67e6af786a557f50a6532bb0906ca9537ca22ad
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-12-12 12:16:45 +01:00
Christian Stenger
b2ff8d8795 Squish: Fix tst_create_proj_wizard
Replace waiting for signal textChanged() and handle new Qt Quick wizards.

Change-Id: Id452703fe21b3162800671db59f722821e7dd3fa
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-11-29 13:56:17 +01:00
Robert Loehning
147e01eb9f Squish: Update tst_session_handling
Change-Id: Iac27111fe5cf41acfc78dd5534583f7a27712c3a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-11-04 13:09:46 +01:00
Robert Loehning
a1274c93c8 Squish: Temporarily disable testing of Welcome mode
Change-Id: I9d8764d11298094c302ae3c979e3bbc23ec68e20
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-11-01 10:22:16 +01:00
Robert Loehning
46bcfe657a Squish: Removed code using Madde plugin
We don't have a Madde plugin anymore

Change-Id: Ic7a9fc33cdd967b642521655123c4b04158786fa
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-10-24 13:35:52 +02: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
Robert Loehning
017e108724 Squish: Update expected values after fix.
QTCREATORBUG-10045 which tst_openqt_creator found was fixed.

Change-Id: I804427276d37ca97ce4577e40cfa73d515218de5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-27 12:27:25 +02:00
Robert Loehning
532292cbb5 Revert "Squish: Remove failing lines for tst_openqt_creator"
Change-Id: Id876fca6e2b192097fed802eca4fe28533a7d4e9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-27 12:27:08 +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
5d1aece721 Squish: Fix tst_default_settings
Change-Id: I2b9e03d77df657b107bc81d3b8f16720c25b4a0e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-20 11:54:56 +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
62e98bf19f Squish: Remove failing lines for tst_openqt_creator
Fix is in master, so this won't ever be fixed in 2.8.

Task-number: QTCREATORBUG-10045

Change-Id: I714832f8fbaa39aea6992c31a41e8dd4fe8dfb16
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-10 15:30:44 +02:00
Robert Loehning
49adb78ec9 Squish: Fix tst_create_proj_wizard
Change-Id: Ie4fb69873edb8be5cfb0e82a920cb90e822f6a7e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-09 11:27:31 +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
cdf8407d67 Squish: Fix determination of available targets
Change-Id: Iff01b44058dd9175aacfb0a0da96f35fb32383e7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-08-29 15:10:32 +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
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
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
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
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
Eike Ziller
ef5d3796d5 Merge remote-tracking branch 'origin/2.7' into 2.8 2013-05-23 07:25:34 +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
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
c74bb8dfca Squish: Clean up
Details:
 * removed unused functions
 * removed "QtQuickConstants" (Targets class is used for more than just Qt Quick)
 * removed Components class

Change-Id: I2908348db3e5a627d63242f9524832812822f790
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-04-10 12:15:29 +02:00
Robert Loehning
3c24824b0f Squish: Explicitly restricting tst_build_speedcrunch to Qt 4.7
Change-Id: Ib28f77d1da9573c4124e5db8e7e972bbabf6ac6a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-04 19:37:14 +02:00
Christian Stenger
c11d901e03 Squish: Improve copySettingsToTmpDir()
Provide ability to omit files while copying the settings as well as
a given destination instead of always using a generated folder.

Change-Id: Ie4a97a90feeff4fd8a8de8b6f0b95a412c17a14c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-03-21 16:53:48 +01:00
Robert Loehning
a4764ad9ef Squish: Fix tst_create_proj_wizard on Mac
Change-Id: I0f69e7d34ee4fb1dec2f30e916ff29a33fb5111a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-03-19 13:58:13 +01:00
Christian Stenger
20fe2651a5 Squish: Fix for tst_installed_languages
This has been fixed now and is no more different on Mac.

Change-Id: I942164e964cce9df1c369c68036875e0da98a96a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-03-19 09:07:58 +01:00
Christian Stenger
67710829fa Squish: Let tst_create_proj_wizard test for Madde too
The test will now execute as before, afterwards enable the Madde plugin
restart Qt Creator and perform the text again.

Change-Id: I08b6f3702af6541e0044f8ae047e42cc4f017a36
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-03-19 09:07:48 +01:00
Robert Loehning
0d9822ae80 Squish: snooze before restarting Creator in tst_installed_languages
Change-Id: Ie548e034f74eeb201e9475950487fc636576ce10
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-03-11 17:34:52 +01:00
Christian Stenger
20c53542dc Squish: Wait a bit before checking settings
Fails on the build machines from time to time because Squish does not
wait for Creator to quit it just invokes the menu item and checks
afterwards.

Change-Id: Ieedc2437006f5af3074c155e514489fe911e815d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-03-08 13:16:13 +01:00
Christian Stenger
e044e7cc69 Squish: Stabilize test for build machines
Change-Id: I8701c6a46ef749e4c2b905554efc16746a991e56
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-03-08 13:16:04 +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
Christian Stenger
b090616016 Squish: Fix tests for disabled Madde Plugin
Part 2: Fixing evaluation of configured kits depending on available
Qt versions as well as determining supported platforms.

Additionally enable verifications for Plain C and Plain C++ projects
as well.

Change-Id: I1f92b44c6771dfc9353b911fdb1ec654c5cc591b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-02-08 17:04:57 +01:00
Robert Loehning
90ffdd8a6f Squish: Updated expected project tree to fixed behavior
Task-number: QTCREATORBUG-8706
Change-Id: I0a7c3defec04417014dd185f501642ad37a12ff2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-02-08 15:07:26 +01:00
Christian Stenger
58c45ca766 Squish: Added test case for default settings
Change-Id: I669a4a464b966ef9cf5a89f38e95e142e3574a1c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-31 16:16:33 +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
Robert Loehning
3f570a7901 Squish: Enable testing with MSVC again
Change-Id: Ib6051caa6e3a52a611aa24c0bf0c4d89939fdd58
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-01-23 12:06:26 +01:00
Eike Ziller
a8a33b9a3b Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
2012-12-14 08:20:49 +01:00
Robert Loehning
0877f4e254 Squish: Sorted test cases in suite_general
Change-Id: I270606e8d9c89988102b5c2d37d345f33bd8da15
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-12-12 18:14:23 +01:00
Robert Loehning
9dd750c57a Squish: Update in tst_openqt_creator
Change-Id: I4055cf6485bd89e756d7aba5f9e3df17d91eedd6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-12-12 16:50:58 +01:00
Robert Loehning
27421b1a81 Squish: Check installed languages
Change-Id: I758381d67c431b4b7d6b7486f1d8561cf09c637b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-12-12 16:33:31 +01:00
Christian Stenger
04e8abfa4c Squish: Fix tst_create_proj_wizard
Change-Id: Id1609b5c4f46036e7a5fb90cd7fc720bd27c1844
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-12-05 09:30:23 +01:00