feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
68,568 Commits 108 Branches 368 Tags
ac47d51bfb379b8c3b51d832d54a90dba18a518f
Commit Graph

1569 Commits

Author SHA1 Message Date
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
2e7e95917e Squish: Remove unused object 
Forgotten to remove this in e03132f517.

Change-Id: I7699c657d0ff8300ac38d96a9430d8c1e372628f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-02-24 06:28:42 +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
Robert Loehning
062678a937 Squish: Add some debug logging to openDocument() 
Change-Id: If34eaad1bd04a7d2409f0e00c217c7bd12add106
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-21 10:49:37 +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
374a51b2e0 Squish: Adapt tst_WELP04 to latest Welcome page changes 
Change-Id: I835bbcf3676816d92160b2eca967af4adcd3876a
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-02-16 05:42:28 +00:00
Eike Ziller
e724934393 Merge remote-tracking branch 'origin/4.2' 
Conflicts:
	doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc
	doc/src/qtquick/qtquick-creating.qdoc
	doc/src/qtquick/qtquick-uiforms-tutorial.qdoc
	share/qtcreator/welcomescreen/qtcreator_tutorials.xml
	src/plugins/git/gitgrep.cpp
	src/shared/qbs

Change-Id: I6f4d168d888d9547c3af0819f79cc9ebb4186ca0
 2017-02-14 15:32:04 +01:00
Robert Loehning
0115cc3103 Squish: Use cdb from Windows 10 kit 
Change-Id: I7e30848f583fd767bf6ad8a4accac7df41ce9167
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-14 13:02:15 +00:00
Christian Stenger
e03132f517 Squish: Adapt tst_WELP03 to latest Welcome page changes 
Change-Id: Ia62813cf94b31a82fedb191eaf11f752d1d30bf0
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-02-13 11:58:37 +00:00
Christian Stenger
9f6f5bfee2 Squish: Adapt tst_WELP02 to latest Welcome page changes 
Additionally move common used code for interacting with the
Welcome page into separate file.

Change-Id: If863ae529c7c81d095f310f0a34926b324c77fa8
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-02-13 11:58:30 +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
Christian Stenger
265890de94 Squish: Adapt tst_WELP01 to latest Welcome page changes 
Change-Id: I582c536666657d56850bb344cc6ca471eb75b01e
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-02-08 13:28:01 +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
0fe03e90b1 Squish: Enable tst_qml_js_console again 
Task-number: QTCREATORBUG-15831
Change-Id: I31dc06c39c2c038205d2512804757c4d7b3429b7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-02 10:29:47 +00:00
Robert Loehning
3dcbdb8dac Squish: Save autodetected MSVC-toolchains 
Change-Id: Ib82eecbb7f4ff8e2daee95a8ed93b5327e7dff99
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-02 10:29:28 +00:00
Robert Loehning
eea9090088 Squish: Remove ancient mobile kits 
Change-Id: I0bb6e2b0f61e7618a166004b418b70efa752a75f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-02 10:29:02 +00:00
Robert Loehning
bea5fe0a63 Squish: Update moved license file in tst_git_clone 
Change-Id: I8a34a878e91a64762b28b03d08334148a3dbe8d3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-01 10:30:29 +00:00
Robert Loehning
97760eda7a Squish: Update BuildDirectoryLineEdit 
Change-Id: I9d789d501a43ff634ea01a3f5b8afe74c026d0e0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-01 10:30:02 +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
Robert Loehning
b805639776 Squish: Remove mapping data for outdated versions 
Change-Id: I5fc21e9cc4dec44a36b7dc2857423cb8b654bbc6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-01-27 13:01:06 +00:00
Robert Loehning
8466f777f5 Squish: Use different function name in tst_CSUP01 on Windows 
This reverts 7746c31774 on Windows

Change-Id: I6161320ee97ecfcd2510f73d955346e1bb9ebfc1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-01-27 12:14:31 +00:00
Robert Loehning
8681608d8b Squish: Clean up tst_qml_editor 
Should have been done in
4b4e5f6990

Change-Id: I0a747ea4bbf0ef02caaf31a14161dced9b4dd806
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-01-27 12:13:55 +00:00
Robert Loehning
79c91e4c30 Squish: Stabilize tst_HELP06 
Change-Id: Id8d642c581b825adc1d958f82280e8bf4f011c41
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-01-27 12:13:42 +00:00
Christian Stenger
bdd0c83751 Squish: Configure C-toolchains for macOS 
Change-Id: I3d4fcc25ecca8a02e8dbbace4fc063a72cd85a40
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-01-18 14:50:26 +00:00
Robert Loehning
1a6e6ed553 Squish: Configure C-toolchains for Linux 
Change-Id: Id2bd1768e2520bbcfdc918939722f7f5935b8fce
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-01-18 08:35:50 +00:00
Robert Loehning
4d79ffb8f3 Squish: Replace progressBarWait() in tst_debug_empty_main 
The progress bar already disappears while we're still in Projects mode.

Change-Id: I7dcf24d1d423eba3057868c4323b2054c99d19f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-01-09 11:56:18 +00:00
Robert Loehning
611a970819 Squish: Configure C-toolchains for Windows 
Task-number: QTCREATORBUG-17406
Change-Id: Iafa1b38f75fa56691e646aaf2fad61504f0706e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-01-06 10:23:12 +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
Robert Loehning
7746c31774 Squish: Use different function name in tst_CSUP01 
realloc is not being listed by Clang Code Model

Task-number: QTCREATORBUG-17490
Change-Id: I006fee04579706fbf5edf8b890bd7be8e090d01f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-01-04 14:43:32 +00:00
Robert Loehning
2a6c315fbb Squish: Workaround unexpected error message 
Task-number: QTCREATORBUG-17492
Change-Id: Icda68a756b3420baa494e90c41dbefc656ae6327
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-01-04 14:42:18 +00:00
Robert Loehning
ae0ea76f07 Squish: Fix timing issue in tst_HELP06 
Change-Id: Ic88207d86cf3f926fc4df681be4cfaa1a62ba763
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-01-04 14:41:54 +00:00
Christian Stenger
3ffec118d0 Squish: Fix switchToBuildOrRunSettingsFor() 
Properties of the model indices did change recently and so
checking for enabled does no more work - use its toolTip
content instead to check for the enabled state.

Change-Id: Idc2b5ed1a0a14cfabdbdb4231eab243d28c0aee7
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-12-21 10:58:05 +00:00
Christian Stenger
be9c7d6929 Squish: Fix triggering items listed under "Recent Files" 
UI has changed again, so adapt the test to reflect this.

Change-Id: I5d6bcf2b48b8b625f6086f5a1101041a73d7e329
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-11-14 06:53:31 +00:00
Christian Stenger
701ccc5e3b Squish: Fix property of projects kit view 
Change-Id: If36d2b0879cf8c8276d68e5a1f1425b6f47fc5dd
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-11-11 16:33:01 +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
Eike Ziller
5b47c653c1 Merge remote-tracking branch 'origin/4.1' into 4.2 
Change-Id: Ibe4cd5522e1d87d56d2aae7a429282b41bf18647
 2016-10-12 16:02:47 +02:00
Robert Loehning
b729d6da7f Squish: Update tst_git_clone 
Change-Id: Ie775ae993651b51699ebfedbe6b37c823392435e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-10-12 11:02:49 +00:00
Robert Loehning
169723dd87 Squish: Fix openVcsLog() when an OutputWindow is already shown 
Change-Id: I47432b7367f238a92921bffb030eada902327bd5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-10-12 11:02:27 +00:00
Robert Loehning
8acca9f37b Squish: Fix error handling in tst_git_clone 
Change-Id: Id59ba23361beb0994f400647680e4facb223d22f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-10-12 11:02:10 +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
Robert Loehning
54a7188c27 Squish: Cloning installer-framework instead of jom in tst_git_clone 
jom's repository can be cloned quicker than Squish can cancel the
procedure, making the test instable. Cloning installer-framework
takes a couple of seconds longer.

Change-Id: I032a4bf60cfd3b070e4c311fbd1dae5b81e8fcd1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-10-07 10:17:20 +00:00
Eike Ziller
90cf4487a5 Merge remote-tracking branch 'origin/4.1' 
Conflicts:
	src/plugins/autotest/qtest/qttestoutputreader.cpp

Change-Id: I4b323f2f3041d015fa04b9a25ec925f3b3e2411f
 2016-10-05 15:28:04 +02:00
Christian Stenger
3adef3cc7c Squish: Remove OSX specific workaround 
Change-Id: I9e43c47c5ef2422d46e10b9f2fd88454b4352c30
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-09-30 10:09:10 +00:00
Christian Stenger
d1c8c5ded3 Squish: Disable gcc compile check on OSX 
Change-Id: I6537bb9e20c9d16689cea520a01b28da8f2ed468
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-09-27 04:43:17 +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
b252733e63 Squish: Use examples and docs from Qt 5 in suite_WELP 
Change-Id: Iddfa426e9c6133bd1f12ec8e119816c2d38ba55a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-09-05 06:46:25 +00: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