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

48 Commits

Author SHA1 Message Date
Christian Stenger
d301824886 Squish: Adjust tests that use Qt Quick UI wizards 
Qt Quick UI had been slightly renamed and Qt Quick Controls UI is
gone.

Change-Id: I990af2bc83513ad8d85838b037e79dc88bbfdb73
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-03-03 12:40:38 +00:00
Christian Stenger
8349242770 Squish: Adapt to changes of project wizards 
Some project wizards have nowadays build system support.

Change-Id: I2d7e9ffd5be2ec74a012fa977281e032596229b5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-02-20 14:56:38 +00:00
Christian Stenger
43b376a738 Squish: Handle wizard check for Quick Controls 2 Application 
This wizard needs a Qt5.7 which we are not providing yet.

Change-Id: I03ba5c86835de40a44530753502f87a46554d6b3
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-11-11 11:31:49 +00:00
Tobias Hunger
954569387c Update License according to agreement with Free Qt Foundation 
* Update license information in tests directory

Change-Id: I311441dd37d053ca3175e44b284258e232ee93e0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 16:01:06 +00:00
Christian Stenger
029b83b8dc Squish: Fix suite_general 
Change-Id: I4e1458555a971d21e42a071e2fc0b135b0b1e91c
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-14 11:19:54 +00:00
Robert Loehning
50c6343615 Squish: Remove outdated kit handling code 
Change-Id: I69f1b6d0d27e9330ff23de0b9d5a09ef02f353ac
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-06-16 14:44:25 +00:00
Robert Loehning
0352e54253 Fix copyright headers in Python files 
Change-Id: Id2c60eae52d315b8b133512d978598d1bc187b43
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-02-13 16:52:03 +00:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Robert Loehning
80f865c057 Squish: Test more templates 
Change-Id: Ia9d5afc621b4e79417f6aa1b64b6b9d9f7b5f38a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-28 11:27:08 +01:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Robert Loehning
1f3d7c9e61 Squish: Include new Qt Quick templates 
Change-Id: I92e359d95bc9cd62b5e1b8a059cb8aef3908bcb4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-05 12:27:12 +02:00
Christian Stenger
e39b623c28 Squish: Fix tst_create_proj_wizard 
Change-Id: Ia34a9055aac52479a331f3c85557291b1c586221
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-07-02 13:43:39 +02:00
Robert Loehning
20c0dcfe1d Squish: Simplify __createProjectHandleQtQuickSelection__() 
Change-Id: I02f76a90aa6a464f36d84dcc70698639a74d7f86
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-15 14:24:27 +02:00
Christian Stenger
ae781b1919 Squish: Update Qt Quick tests to reflect new available versions 
Change-Id: I60d4b2ca64825101358774a4e04cceb3040fc630
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-19 14:38:55 +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
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
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
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
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
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
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
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
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
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
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
Christian Stenger
18e0363c71 Squish: Remove unnecessary calls to clean up 
Change-Id: I981392e5ef3397c3b80f1031e0644f84de1445f2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-11-28 21:11:05 +01:00
Robert Loehning
77313fd980 Squish: Removed pointless explicit timeouts 
Change-Id: I21e41fc8d1c26186afe0d18613c764abd065227e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-11-05 12:59:07 +01:00
Robert Loehning
95af1cd4f8 Squish: Added helper functions for views and models 
Change-Id: Ic5dc4a5fe11ec5f693ef9f5ddf3abbefd689fd99
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-25 13:58:34 +02:00
Robert Loehning
832bc738c7 Squish: Improved checks before working on projects 
Change-Id: Ieb230be55b94d00be272cb84796ce8fd22f4f8f7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-09-27 17:32:39 +02:00
Robert Loehning
021436856f Squish: Removed workaround for QTCREATORBUG-6994 
Change-Id: Id4e5ee4f9235b768a3145e6c562e29e1662ac72d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-09-26 10:52:04 +02:00
Robert Loehning
4a1be4d0b9 Squish: Fix in tst_create_proj_wizard 
Change-Id: I6d8541f1e734bc1f425456b22b2b392f181a62c7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-09-25 12:08:16 +02:00
Christian Stenger
efa91f005b Squish: Fix for renaming Targets to Kits 
Change-Id: Ia3faec39499bc7e65d5d0a0fb7963fcb4016c6d5
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-05 13:55:21 +02:00
Christian Stenger
ac6ca18ec0 Squish: Fix tst_create_proj_wizard 
Change-Id: Ibccb5b6c1496d5ae4c9021086d55dc4236f6ac71
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-03 17:48:55 +02:00
Robert Loehning
f521c9f062 Squish: Always use the same function for preparing templates 
Change-Id: I90dac33dde4c0c3d39c8e8038371dfbb3403dce3
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-04-05 17:22:06 +02:00
Christian Stenger
bf993e1fda Squish: Fix change to upper-case 
Change-Id: I8ce23ea8cc846001d207fc42cb53c02bf9a1b6d5
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-03-05 10:47:30 +01:00
Robert Loehning
3aaa3b3fa4 Squish: Fixed handling of targets 
Done-with: Christian Stenger

Change-Id: Iaa03a3df2151706bbe5d508a20f70a5007817d4d
Reviewed-by: Bill King <bill.king@nokia.com>
 2012-02-29 13:28:09 +01:00
Christian Stenger
25decf2052 Squish: Fixing Mac 
* removed unused object
* refactored invokeMenuItem()
* always lookup cppwindow to avoid failing type()
* use objects stored inside objects.map to avoid LookupError
* reverted raising timeout to 60s
* added workaround for missing focus on Mac right after
  startApplication()
* removed the need to have a shell-script called 'qtcreator'
  (make sure to add 'Qt Creator.app' as AUT now)

Change-Id: I21511d810deedf31dfb19b896edd21b79e73b755
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-28 14:33:19 +01:00
Christian Stenger
e1970f1823 Squish: Add workaround for QTCREATORBUG-6994 
Change-Id: I8077f50a1359db9044a0b0c607e3cc94e7f1f042
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-23 16:42:05 +01:00
Christian Stenger
a6f9035396 Squish: Clean up (Bug 6967 is closed) 
Task-number: QTCREATORBUG-6967

Change-Id: I460110bbad5a400aef474f837fe29c2821594fd5
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-23 14:15:18 +01:00
Christian Stenger
c9999a9382 Squish: Fix for running inside Jenkins 
Change-Id: I443864e41e227e2d5638f668de272c6c7b9a5229
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-22 21:01:16 +01:00
Robert Loehning
0e0158fc3f Squish: Cleaned for-loops 
Change-Id: Ide5313c8838aa7ad9ad74cbaed12872ce0a35413
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-02-22 16:58:01 +01:00
Christian Stenger
3ad7e50827 Squish: Verify targets for project creation 
Change-Id: I3af0e0cde985c4b04bd4ae8181c3b82cda22b2b8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-02-22 13:57:47 +01:00