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

249 Commits

Author SHA1 Message Date
Eike Ziller
cec29f34ea Merge remote-tracking branch 'origin/4.2' into 4.3 
Conflicts:
	doc/src/qtcreator.qdoc
	tests/system/suite_general/suite.conf

Change-Id: Ia298b177d6920a1d853e342b62cf98f7c48a278a
 2017-03-09 12:14:55 +01:00
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
27789d2715 Squish: Add minimal test for custom wizards 
Change-Id: I4de8c92ad8b40d2a8e275a53763b17b953ef69dc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-03-03 12:40:26 +00:00
Robert Loehning
77cf864e89 Squish: Test removing of kits 
Task-number: QTCREATORBUG-17702
Change-Id: I545e9f30dd61eae5a49ff0c56a63dc89f92ce6de
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-03-03 12:33:11 +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
Eike Ziller
1704c484a8 Merge remote-tracking branch 'origin/4.2' 
Change-Id: I9006dd493707ae626ae3502541599c8789e1aab0
 2017-02-27 15:17:37 +01:00
Robert Loehning
126a031ee2 Squish: Wait a second in checkNavigator() 
Change-Id: I45bad30e28f7374ae10d5b0155e08d8297f44448
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-27 11:01:44 +00:00
Christian Stenger
ed67e7121b Squish: Fix tst_session_handling 
Adapt to changed UI and Welcome page.

Change-Id: I413835926411687d6161026da42be97b2b6a41c3
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-02-24 06:27:55 +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
eb4b4d7be2 Squish: Fix iterating over debuggers 
Change-Id: I6648e74f8f8e0c581a4bd4ba4b3606e3f18a5af5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-02-10 12:16:24 +00:00
Robert Loehning
69df8ec321 Squish: Add those from Windows 10 kit to expected debuggers 
Change-Id: I5281fa5dc126a7cf1ea84592f735cb11d908b82d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-06 07:07:42 +00:00
Robert Loehning
326d40dde1 Squish: Parse qtcreator.pro with Qt 5.6 to avoid changing results 
Change-Id: I47cecb8ac8aaf1d5a845b801ff4038b3f023a220
Task-number: QTCREATORBUG-17577
Task-number: QTCREATORBUG-17609
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-01-30 12:52:09 +00:00
Christian Stenger
9d328ef1a9 Squish: Fix adding new kit 
Projects view has changed and so has functionality of adding a new kit.

Change-Id: I44377822b8b850fd17be24e12f7e5d0104be568d
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-01-06 05:51:59 +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
Christian Stenger
9b09bf62bd Squish: Fix tst_default_settings 
QC now supports C compilers as well, adjust the test to reflect this.

Change-Id: I20f2264b31c1f21384b463beccbc27ab1073083c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-11-07 10:12:52 +00:00
Robert Loehning
bd8c12c94c Squish: Update tst_session_handling again 
Someone removed the numbers again.
This reverts commit 816d0010c2.
Also, the sessionList was replaced.

Change-Id: I23e135e5b240321e30097c0d1d48c82cb24b6c49
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-10-13 09:19:34 +00:00
Robert Loehning
816d0010c2 Squish: Update tst_session_handling for numbered sessions 
Change-Id: I2821f55440e13eeb9ca81589ffd746e713ae0e16
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-10-10 10:36:19 +00:00
Eike Ziller
c635c6b50a Merge remote-tracking branch 'origin/4.1' 
Conflicts:
	share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml
	src/plugins/android/androidrunner.cpp
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp
	src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h
	tests/system/suite_WELP/tst_WELP03/test.py

Change-Id: Ibac4d71d4f4dbe1e4f05052d2f8a2dcfd82edd4c
 2016-09-13 12:15:09 +02:00
Robert Loehning
309be8277d Squish: Use example from Qt 5 in tst_rename_file 
Change-Id: Ibf436af685897de730826927f746fc1de0c8f12e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-09-05 05:30:33 +00:00
Eike Ziller
c56aa52b80 Merge remote-tracking branch 'origin/4.1' 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qmakeprojectmanager/makestep.cpp
	src/shared/qbs

Change-Id: If1787ed23afa786ed2cef57f53c1db642559cbe0
 2016-08-31 14:40:38 +02:00
Robert Loehning
06ac9f00c0 Squish: Improve probabilty of dirseparator in generateRandomFilePath 
With up to 43 characters it's more probable to
not have a dirseparator in the generated string.

Change-Id: Ib59fc55eb0b78c9796e19006c057571d7d494e40
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-08-30 09:41:46 +00:00
Orgad Shaneh
1b34f2a4b8 Merge remote-tracking branch 'origin/4.1' 
Change-Id: Ia90424d479936a898705c433e5810c77ae088b2c
 2016-07-22 15:18:00 +03:00
Robert Loehning
38c7ce6518 Squish: Expect parameter amd64_x86 for MSVC2015 
Change-Id: I7a8e1659ca88dc2aaff5129bf2fcf3e7014fe577
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-20 11:11:29 +00:00
Robert Loehning
75e47e03e3 Squish: Use examples from Qt 5 in tst_session_handling 
Change-Id: I038f04b4c6243dfb37516560ca23001d854c1a4f
Task-number: QTCREATORBUG-15469
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-18 13:59:49 +00:00
Eike Ziller
7e1b4ccebb Merge remote-tracking branch 'origin/4.1' 
Change-Id: I041b949aff8bee481a572ba6f7e2ef72b9010923
 2016-07-15 14:10:38 +02:00
Robert Loehning
3685499785 Squish: Update Creator's sources to v4.1.0-beta1 
Change-Id: I7176f77a55816bc35184b9689838b78b8d0baff7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-13 12:11:11 +00:00
Robert Loehning
c8e83d0adb Squish: Remove outdated version check 
To build Creator, you need Qt 5.6 at least.
To test Qt 5.6 you need Squish 6 at least.

Change-Id: I5b4c08da64df749961544c25f3ed691ff56d2cc0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-13 11:10:02 +00:00
Christian Stenger
87ab577992 Squish: Adapt to changes of wizard template 
Qt Quick template does no more use a pri file.

Change-Id: I5418d1b945c8981218ddcbcf5423d6c623b377b6
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-07-01 10:06:22 +00:00
Robert Loehning
c1e7cf84e4 Squish: Do not use shell in getOutputFromCmdline 
Change-Id: I731b119169063912cd3b528a1a6a58727002ae67
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-05-30 09:13:04 +00:00
Christian Stenger
3b820cc9a4 Squish: Fix tst_installed_languages on OSX 
Change-Id: I470047d663ec4c2bfebaa17baf67bc811d9c0c65
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 13:06:15 +00:00
Christian Stenger
b1e9290b73 Squish: Raise some timeouts a bit... 
...as these frequently fail on OSX.

Change-Id: I200fa1e57e8ec98221c9a82177565d9e60b79356
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 05:08:23 +00:00
Christian Stenger
532cd88dd7 Squish: MSVC2015 and Build Tools are supported... 
...so, expect them if they are present.

Change-Id: I333bba81717d44431857a543540e5599e2de7fed
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2016-04-15 12:08:58 +00:00
Robert Loehning
483fcb6ab7 Squish: Update object in tst_session_handling 
Change-Id: Ia1f327cf2a69e74d242bf4ad7d7ed8cfd7cd3a34
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-31 13:35:15 +00:00
Robert Loehning
db2ab92801 Squish: Remove outdated code 
Creator can't be built with Qt 5.4 anymore.

Change-Id: Ic3c014e8384c72c10a48c65117c53daecaa683ab
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-31 10:25:32 +00:00
Robert Loehning
4ec10b55e8 Squish: Update expected files for tst_openqt_creator 
Change-Id: I32deb594e6836ba2dd627cdc1613bfc1fc26cd47
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-25 16:56:53 +00:00
Robert Loehning
4ad4f17811 Squish: Update expected files for tst_opencreator_qbs 
Change-Id: Ia840b6fef18bf09bce9938e9b2df5916e454bd7c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-25 16:56:38 +00:00
Eike Ziller
74cdce071f Merge remote-tracking branch 'origin/3.6' 
Conflicts:
	src/shared/qbs
	tests/manual/proparser/main.cpp

Change-Id: I13654bf10c14eb6b1d6805fe86b67ac73b2e4d75
 2016-02-24 10:08:37 +01:00
Robert Loehning
e71cb3ae62 Squish: Update expected sizes of project tree in tst_session_handling 
Directories in resource files are now displayed as
separate items, adding two more entries to the tree.

Change-Id: I398469bfe7680c73ab0440fdb9dc6f75e101f2f4
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-22 10:21:11 +00:00
Robert Loehning
9d8e4aa922 Squish: Test overwriting of files when adding class 
Change-Id: I86ed9a3749f692fe9ead13c31e0ba62c2baa3020
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-16 13:14:35 +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
Robert Loehning
a9ffcbcf89 Squish: Update project tree for qtcreator.qbs 
Change-Id: I94ba5523fbbd715e44b228f2936148825ad43c94
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-01-04 15:46:13 +00:00
Robert Loehning
e94de191b0 Squish: Update objects of Qt version settings 
Change-Id: I2fce4d860a70230519d7f56e58d88a03dbb379ba
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-10-30 10:46:24 +00:00
Robert Loehning
1a9e097c80 Squish: Update tab's name in tst_installed_languages 
Change-Id: I22f69a589d8bb32c3fa7d984ada67043340e5e27
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-10-29 13:13:40 +00:00
Robert Loehning
1d88042b3f Squish: Remove dir separators from expected project tree 
Project tree displays native separators since
d7a373ef26

Change-Id: I75a9b391641a20f32000f909b5310ad702ab0ee3
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-10-05 05:41:59 +00:00
Robert Loehning
f885286d22 Squish: Update expected project tree for qtcreator.pro 
The handling of .pri files was changed in
51ba32bccc

Change-Id: I581bfa00465e1d9f3c4bbcdfefa4d64555d48c73
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-10-05 05:41:52 +00:00
Robert Loehning
e087ed2452 Squish: Fix tst_default_settings 
Change-Id: I136d93e7b698dcda5388bc24b9bcaaae482fb861
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-21 11:01:43 +00:00
Robert Loehning
ebad4ed2c1 Squish: Test warnings about outdated Qt version 
Change-Id: Id5c3243ace16ef545386cc3f63744963edd5fda1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-11 12:14:45 +00:00
Robert Loehning
e873f872ef Squish: Reanimate tst_opencreator_qbs 
Change-Id: I00d1d1baea71e5b63a1a6b7c11aaf47e74082a21
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-03 14:58:53 +00:00
Robert Loehning
9c9dbe3c53 Squish: Update Creator's sources to v3.5.0 
Change-Id: Idc41db621470886920173f7d5caf366204408731
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-03 11:41:20 +00:00
Robert Loehning
652ff8efeb Squish: Add test for creating new C++ class 
Task-number: QTCREATORBUG-14949
Change-Id: Ie42471f174eaacab2810eec12c2af4201a9374fe
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-01 09:44:28 +00:00