feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
61,421 Commits 108 Branches 368 Tags
005e7aa54de0932323e44f752a4b51a421d0dc7d
Commit Graph

55 Commits

Author SHA1 Message Date
Robert Loehning
522a90913a Squish: Add name of FancyTabBar object 
Change-Id: I1cbd1af800731e2c9908604ecaa5c0513410e55c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2019-02-04 13:37:55 +00:00
Robert Loehning
2c6a57be9c Squish: Move imports of "os", "re" and "sys" into shared class 
Change-Id: I349cb255b8fa6f96e32d5dacb3c9b58ddeb76897
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-08-07 09:25:05 +00:00
Robert Loehning
ff10f8c3a5 Squish: Fix warnings 
Warnings from static code checks, that is, not test.warning() at runtime.

Change-Id: I651d13491106583908059ecdb5f700f539b6d9c8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-08-06 14:21:30 +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
Christian Stenger
dfdfff2148 Squish: Fix expected string 
Capitalization has changed.

Change-Id: Icbfa295beab27c1cfb2ec1ae6198784f134563a6
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2018-06-22 10:50:17 +00:00
Robert Loehning
149a77a01d Squish: Handle third kit state 
Change-Id: I3442cf7676b7f316a60344b9c7dfc2d777529785
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-06-04 11:23:51 +00:00
Robert Loehning
1ac527d8f6 Squish: Don't configure Windows firewall when we don't need to 
Task-number: QTCREATORBUG-20316
Change-Id: Ibec253f15a39dc22ab8bd1693eab38b0ab7b44fb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-05-09 08:46:39 +00:00
Robert Loehning
5a54a813d3 Squish: Remove code for querying information about Qt 
Task-number: QTCREATORBUG-20337
Change-Id: Ib99d3bb45297b766ac1797a2a364350d96ce0056
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-05-08 09:06:02 +00:00
Robert Loehning
c5511de338 Squish: Remove hooking into subprocesses 
It worked well but the maintenance burden turned out to be too much.

Task-number: QTCREATORBUG-20055
Change-Id: Ic8663f808c50ca9fb17d52b6bc6c72baf7503358
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-05-02 09:51:05 +00:00
Christian Stenger
bae0368034 Squish: Fix switching to build or run settings 
If too many kits are present and/or the screen resolution is
too low to have QC having the correct minimum windows size
Squish fails to click on the items as it might be necessary
to scroll to them to have them really (user-) visible.
There is an obvious difference between 'visible' for Squish
and 'visible' for the interacting user.

Change-Id: Id658a323fcf2ae3882b225c6ce9383ed2c876e81
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-05-11 05:48:21 +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
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
c8e40f5b56 Squish: Adapt to changed Projects view 
Change-Id: I9728a04864cdef7ae609f6a983cd92aa3c79e4f5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-08-12 14:10:14 +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
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
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
Christian Stenger
7901601eb0 Squish: Simplify __selectTreeItemOnBuildAndRun__() 
Change-Id: If1bc3f610cd59041fb4e6ce9edd38354f73b141d
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-09 14:00:37 +00:00
Eike Ziller
45e544b442 Merge remote-tracking branch 'origin/3.3' 
Change-Id: I79fac4a4e8535153da1b3f73a6b1caad1513ea9c
 2015-02-16 12:35:54 +01: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
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01: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
6ad3f3975c Squish: Update menu objects 
Change-Id: Id1c8ee441a8479aa2bd19410e88c4ea48d0ee3f9
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-15 15:17:54 +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
1d8c2e61b4 Squish: Update getQtInformationForBuildSettings() 
Change-Id: I54df50a31bd1bc937668870e86666156ecddb6ce
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-27 13:27:47 +02:00
Christian Stenger
06d34f5a12 Squish: Unify hack for invoking context menu items on Mac 
Change-Id: I7e4d1cb00ea75e1aa33fa20b30744ffd56f002de
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-29 13:50:57 +01:00
Christian Stenger
f710048c92 Squish: Add workaround to avoid AUT crash on Mac 
The crash was actually only in tst_SCOM05 as WELP suite is
completely disabled.

Change-Id: I32d9bef43dc50eb8d3c71a5b1d6e7894c7d74276
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-17 16:14:38 +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
Christian Stenger
d787e4e2ab Squish: Enhance tst_default_settings 
Change-Id: I150d4d53a6e6e93749f9cdbfe33971633805573a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-06 14:23:35 +01: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
Christian Stenger
4fc9302c56 Squish: Move common code to shared file 
Change-Id: I5e268d6faf9a2a5a779e850667c582328c42387d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:10:14 +02:00
Christian Stenger
97a6ee9685 Squish: Added test for checking locals 
Change-Id: I8c676982d335c772a5911cab23a52acb2a094ed1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-07-11 09:16:20 +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
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
4319b64c62 Squish: Fixed typo in getQtInformationForBuildSettings() 
Change-Id: Ice68ff84354fa35da7d1217abc3e40acc3783691
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-04 11:30:27 +02:00
Robert Loehning
bf3ab4f0db Squish: Fix clicking Qt versions 
Change-Id: I8252b2a9a7bfe7b9fe1d1660a15d780f9a0560ea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-27 12:09:01 +01:00
Robert Loehning
ec1d081178 Squish: Fix hooking for multiple kits 
Change-Id: I5389d6aadd39f6c7f7ca6a74e006b110373eee28
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-06 13:49:14 +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
Robert Loehning
feae690513 Squish: Update for Target -> Kit renaming 
Change-Id: I3c8ae3c67f2459c13b885ed935bb1dc31e09c359
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-11-20 12:44:15 +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
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
ec1fd75f7b Squish: Fix hooking into Qml project 
Change-Id: I358a6ac7acacb44f23161019d3d2a83e5d6e84cc
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-08-24 16:36:42 +02:00
Christian Stenger
f33d0179a7 Squish: Fix for UI change 
Implementation of TargetSelector has changed - this patch adjusts the
click positions for build and run settings.

Change-Id: Id65a00d8dba66d6be158ca86969795ce1196e569
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-08-21 17:24:01 +02:00
Christian Stenger
6078d7e028 Squish: Fix handling of project settings 
This patch handles the removed Qt version combobox.
If applied this should let some more tests (using compile or debug)
run to the end.

Change-Id: I288eda85eb7bdc62309252bfe883608a50b7fb8d
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-08-07 14:23:51 +02:00
Christian Stenger
7f962aeb6b Squish: Fix setRunInTerminal for 1-target-projects 
This fix just removes the dependency to the scrollArea
that exists when there are more than 1 targets but is
missing when there's only 1 target available.

Change-Id: I02594aa5226f53ffaa5e3693b8075f5ef88c5f88
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-07-31 15:36:23 +02:00
Christian Stenger
a4fa090e11 Squish: Improve handling for 1-target-projects 
If there's only one suitable target for a project
the TargetSelector will be missing and the DoubleTabWidget
must be used instead.

Change-Id: I140b483d8afaaed7f25a3adb58bab65bffbf7322
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-07-24 09:04:43 +02:00
Christian Stenger
eeb7ecbb40 Squish: Fix for UI change 
Additionally changed waiting for TargetSelector
from 20s to only 5s.

Change-Id: I2e342faa6f87b86335bb01f28832ad9c01a27ffb
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-06-18 20:13:58 +02:00
Robert Loehning
f3bb330ea0 Squish: Further improvement of switchViewTo() 
Change-Id: I25f857f05120882427a8ba7569a4c1b66c474f5e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-27 16:28:19 +02:00
Robert Loehning
ae070f3277 Squish: Fixed issues in switchViewTo() 
Change-Id: I693ad1bf30c8644f07bd4188178cb96d374a3ea1
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-03-26 18:37:37 +02:00
Robert Loehning
44e4c45e64 Squish: Simplify selectFromCombo calls 
Done-with: Christian Stenger

Change-Id: Ie9b2691675b12fb4d84f9239358c7db4ab60c431
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-12-09 16:08:11 +01:00