feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
57,704 Commits 108 Branches 368 Tags
2a8c48cb15d50b8686e5cb4f29a96f4431a0ec37
Commit Graph

56 Commits

Author SHA1 Message Date
Christian Stenger
1016dc0603 Squish: Refactor starting Qt Creator from Squish 
Change-Id: I7cbce7db2a22a7cb327965b9b7918eb46266b260
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2018-09-05 09:24:18 +00:00
Robert Loehning
da21353276 Squish: Don't explicitly pass default to createNewQtQuickApplication 
Change-Id: I006c6cad0e972006475ad488b9a71def09de0dbb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-08-02 11:48:37 +00:00
Robert Loehning
e8acb75115 Squish: Refactor selecting configured Kits in project 
The design of the Projects mode changed several times. We wrote lots of
workarounds to keep even more old code alive because we never had the time
for a proper refactoring. This time is now.

Leads to more stable code with far less variables flying around.

Task-number: QTCREATORBUG-20265
Change-Id: I29e5956ea3279cdb1d6da61bf5b461666de436bc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-08-02 11:48:14 +00:00
Robert Loehning
bd8027d232 Revert "Squish: Update expected line in tst_simple_debug" 
...because the project template was changed once again.

This reverts commit fe5249c401.

Change-Id: Ie7940c4dfa98ed71d8c1e937c087918f9157cbfd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-12-13 14:36:42 +00:00
Robert Loehning
fe5249c401 Squish: Update expected line in tst_simple_debug 
Project template changed again.

Change-Id: Ibd2767719e13e3de041e63e0977d838aa6c34f3c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-12-01 10:20:43 +00:00
Robert Loehning
cf370d5305 Squish: Update debugger tests 
The used project looks a little different now.

Change-Id: I786749a4aae5d2ceaff0d2fc65aedf41c04a66f2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-09-26 10:25:49 +00:00
Robert Loehning
11abd8edf7 Squish: Replace Qt4 SDK by self-built Qt 4.8.7 
Change-Id: If990367afb01aae94755930c02c81ae82b23bb8f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-07-31 14:04:00 +00:00
Robert Loehning
f78327a571 Squish: Use list instead of bitfield for kits 
Change-Id: Ia2e1f3aa9ea723deb9f2a2c88e2f97be8ae0e833
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-03-03 12:32:36 +00:00
Robert Loehning
f562f867fc Squish: Use shadow builds in tst_simple_debug 
So MSVC2010 and MSVC2013 don't get in their way.

Change-Id: Ib32c30dc0cc960756bb423348d88452aa20fbfcd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-25 12:36:58 +00:00
Robert Loehning
9600033abc Squish: Fix long outdated messages 
Should have been done with
bef8f58fe8

Change-Id: I25730c97fc77cb560d892738545775d024ce5eeb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-20 13:50:55 +00:00
Christian Stenger
0e331a2e29 Squish: Adapt to changes in Quick Application template 
The template has slightly changed in 6b506b34ec.

Change-Id: Id58e67beacaac046c6dd235b715f360dc7ef4c09
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-30 12:35:39 +00:00
Robert Loehning
9e63807134 Squish: Remove workaround for fixed bug 
This reverts commit ca66ad3d0c.

Task-number: QTCREATORBUG-15806
Change-Id: I2e81aa5c0fe014be6dda32b326ab3d4a1bfd9600
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-04-15 13:19:59 +00:00
Robert Loehning
ca66ad3d0c Squish: Expect missing breakpoints in qml 
Task-number: QTCREATORBUG-15806
Change-Id: Id7b5966a4ae6fafe979f7373718b89fdcc2b918b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-04-07 14:40:59 +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
f5b9a2f4ef Squish: Fix tst_simple_debug 
Change-Id: I8d90c0279d73a1902627d76388a5fa5497fb520d
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-10 14:55:29 +00:00
Robert Loehning
434c99f08e Squish: Remove outdated workaround for Mac 
Change-Id: Id2554aa15eb32511f56386941044fa322fab767c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-25 14:39:24 +00:00
Robert Loehning
243a0e54be Squish: Fix bitwise operators for selecting kits 
Change-Id: I4373e8f07b124f61a743d5c922a45f2962ac7392
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-19 13:35:45 +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
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
bacf4f0afb Squish: Do not crash tst_simple_debug if debugger can't stop 
Change-Id: Iedf0335088739ed60f321b6479711298067f9038
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-26 15:42:30 +02:00
Robert Loehning
556ec551d7 Squish: Selecting right config in verifyBuildConfig 
...by just calling selectBuildConfig.

Change-Id: I8f07b3d874c22ebeca8e5cf658d754cf231c7ad0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-15 12:17:31 +02:00
Robert Loehning
8eefc34419 Squish: Update paths to QML files 
Reaction to 96367b6253

Change-Id: I9651f9cac2b6c48158fa9094ef86ef04460e8a16
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-04-08 16:44:23 +02:00
Christian Stenger
79497e7fae Squish: Fix Qt Quick 1 related tests 
qrc files are now used in Qt Quick 1 template as well.

Change-Id: I7b7541d16100285893587605bb1b4130277b72e4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-21 12:56:18 +01:00
Robert Loehning
90dc3fec6d Squish: Fix tst_simple_debug after change of file template 
Change-Id: I44a8450ae089c14aac8911d6e3c5802b497d9044
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-06 15:38:14 +01:00
Christian Stenger
0f1105d8c1 Squish: Add workaround for mixed debugging bug on Mac 
Change-Id: I4634a10d06ff30998787a215886b642d8349bb8f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-03 13:13:34 +01:00
Christian Stenger
48770e5785 Squish: Remove gdb debugging helper stuff 
Change-Id: Ib437d65da31546c8705b64d5ab320f7a7e226bc7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-17 14:50:12 +01:00
Christian Stenger
f3f1edfa06 Squish: Fix Qt Quick / QML related tests 
Adjust expected files to slightly changed layout.

Change-Id: I4b5ab838558b2e1b3a0c13fafcc37efebb014c19
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-12 17:23:56 +01:00
Christian Stenger
dc8481ca25 Squish: Stabilize tst_simple_debug on Mac 
Change-Id: Ibcf179a1d10c0e735fe408a7f738309834d8abc4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-22 16:08:58 +01:00
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
98c9847868 Squish: No QML debugging with Qt 4.7 
Task-number: QTCREATORBUG-10528
Change-Id: I41eab9bc179cb00b489dbc7576dd36c6377569a6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-11-22 17:20:49 +01: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
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
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
2a261588f4 Squish: Add helper functions to Target class 
Change-Id: Iba67cc28d29346689ca8443ce0b594056feaa0cf
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-10 13:39:10 +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
ac57bee146 Squish: Fix execution of tst_simple_debug 
Targets checked for debugging libraries now match the targets
selected while creating the project.

Change-Id: Ib5e73254b549a66850da64ffb955531aae6b3477
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-09 16:54:03 +02:00
Robert Loehning
f09ce82e23 Squish: Made tst_simple_debug more strict 
Change-Id: Iac438c8a55c8ea144c682257e140f9370e999e69
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-08 12:39:33 +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
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
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
fe74a9a722 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/cxx11/cxx11.pro
	tests/auto/cplusplus/cxx11/tst_cxx11.cpp
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70
 2012-11-09 11:20:10 +01:00
Robert Loehning
e60d2af0b1 Squish: Updated iterateBuildConfigs() to handle multiple kits 
Change-Id: I724e45bf510015dbdae6cb4c6cb55285167dafbc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-30 09:54:22 +01:00
Eike Ziller
d5d1c5e394 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
 2012-10-09 11:50:17 +02:00
Christian Stenger
38e27f8056 Squish: Fix checkDebuggingLibrary() 
Additionally:
* extracted iterateKits() for better re-use
* added parameter to iterateQtVersions() for easier usage
  when using iterateKits() as well

Change-Id: I8bec8ca8e1e37a233c121dbcfbf1c89104f79a7d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-10-09 10:03:22 +02:00
Eike Ziller
a55d47544a Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.qbp
	src/plugins/qtsupport/baseqtversion.cpp
	src/tools/tools.pro

Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
 2012-09-26 10:01:04 +02:00
Robert Loehning
e51863ee1a Squish: More explicit name for Desktop kit 
Change-Id: Ibc711e37ca71d3543a8fa8b46fb2ac7c9c5c4129
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-09-25 14:11:12 +02:00
Robert Loehning
b99fd060e1 Squish: Updated tst_simple_debug 
Change-Id: Ida1508c5e2f15a3fc79066d5133b91c0f9e3affa
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-09-13 13:57:54 +02:00