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

47 Commits

Author SHA1 Message Date
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
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
a127bb780c Squish: Remove outdated workaround 
Change-Id: I717e3422f728fcf71bc984c0c9113ecef6341163
Task-number: QTCREATORBUG-13700
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-30 09:35:17 +00:00
Robert Loehning
54438b21aa Squish: Removing Qt 4.8.0 MinGW kit 
Change-Id: Id88c715ee294e337600a5b41abd79569b11eddbf
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-26 13:21:45 +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
1be459d9dc Squish: Avoid error in tst_build_speedcrunch 
Change-Id: I2f199f392016005b8e00e48253838370628875d9
Task-number: QTCREATORBUG-13700
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-12-15 16:25:04 +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
ef38ac778c Squish: Update SpeedCrunch to 0.11 
Change-Id: I47d118f9612020d514fcb8ea3a26bf392fa41ef4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-16 14:42:46 +02: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
8050e136e7 Squish: Added kit "Desktop 480 GCC" 
Change-Id: I20296f8819837fd613c6328d6c19fc8be82927b3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-15 12:42:18 +02:00
Robert Loehning
c0272c7919 Squish: Updated used MSVC Qt versions 
Change-Id: Id44c5715c48feeeec0c10a029556c25658e70e72
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-06-24 12:57:30 +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
c8984dc58a Squish: Using progressBarWait() instead of waitForSignal() 
Change-Id: Ia87569c080f3b54dd8f78b023408de76eb3c574c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-02 10:13:19 +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
Robert Loehning
3c24824b0f Squish: Explicitly restricting tst_build_speedcrunch to Qt 4.7 
Change-Id: Ib28f77d1da9573c4124e5db8e7e972bbabf6ac6a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-04-04 19:37:14 +02: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
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
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
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
Robert Loehning
0299d54d2d Squish: Cleaned path maintenance in tst_build_speedcrunch 
Change-Id: Ic3cb8571c79ab2880975a439d893ba794c153d7e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-18 19:32:17 +02:00
Robert Loehning
e0ffb2f6e0 Squish: Updated tst_build_speedcrunch 
Change-Id: Ie5228fec880b3c9c1d5c24799973107677b724f3
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-07-24 14:57:35 +02:00
Robert Loehning
bef8f58fe8 Squish: Updated calls to iterateBuildConfigs 
Change-Id: Idca2d311399194b455e211fb72d1fcf810cbb624
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-07-24 13:55:33 +02:00
Robert Loehning
046f42b282 Squish: Removed unused code and data 
Change-Id: I20df2aa148002ecb9b1526df125daf04bc76010e
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-06-04 14:58:33 +02:00
Robert Loehning
a71b768675 Squish: Added fatals when no Qt version was found 
Change-Id: I1d1f4f378ef60107a488477bce40dacaabbe4109
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-05-21 17:12:39 +02:00
Christian Stenger
5ce804b53b Squish: Add Qt4.8 to qtversions.xml 
This is just a preparation for the next patch.

Change-Id: Icac8584029b4119ebbc70f2cb5766768a61e21a8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-03-27 14:04:34 +02:00
Robert Loehning
c51a128efb Squish: Fixed typo 
Change-Id: I4b694b0ba007ba7f7d6af37857fca57ceecdc4f0
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-17 15:45:05 +01:00
Robert Loehning
73005e6bca Squish: Added functions for switching build configurations 
Change-Id: I03eb8987ec28bac7db99395ed91952d8a3a0d038
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-01-17 15:44:47 +01:00
Robert Loehning
4d2d62a6ad Squish: Improved tst_build_speedcrunch 
Change-Id: I09c25505354d9f6a3613e86ef5121ab37857f194
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-12-19 14:05:45 +01:00
Robert Loehning
d229705d7b Squish: Checking if the right build configuration is set 
Change-Id: Ib889d1d8269a8c58edc12b688360b94a0b4bdedf
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-12-12 09:24:45 +01:00
Robert Loehning
844b1c0490 Squish: Improved timeouts 
- tuned timeouts according to expected duration
- use default timeout instead of passing equal value

Change-Id: I90bcbc5ecfd420a01e05acabc987a67b322c1f3f
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-11-29 14:34:21 +01:00
Christian Stenger
b042661686 Squish: Fix this test for Creator master branch 
Change-Id: I3f8a9238af15ec15a94f458ce55cb77a47b248f9
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-11-28 14:06:22 +01:00
Christian Stenger
702b3f17ab Squish: Fix test for Linux/Mac 
Because of a different naming of the Qt versions on Linux/Mac
this test always runs without starting a build on these OS's.

Change-Id: I93d89576ee6f56d7de9aee70aa79ea58a4239c5f
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-11-01 13:57:35 +01:00
Christian Stenger
92e4bec731 Squish: Remove also versioned .user files 
Change-Id: Icf4325930f5e1bd908fef9cbd87658b4cc8fc110
Reviewed-on: http://codereview.qt-project.org/5601
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-09-27 14:03:06 +02:00
Robert Loehning
692806bb8f Squish: Starting test cases only if needed files are present 
Change-Id: I41a73ce1a4f0d0578cf59af5c69fc19f9ec11dd9
Reviewed-on: http://codereview.qt-project.org/5555
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-09-27 11:15:29 +02:00
Robert Loehning
08dfd0d08a Squish: Improved path constants 
Renamed the old constant SDKPath to srcPath because this is where sources are.
Added new constant sdkPath for the root directory of the Qt SDK installation.

Change-Id: I1b1f346554f58629a9d1882f90250f21708e4d22
Reviewed-on: http://codereview.qt-project.org/5474
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-09-26 12:22:07 +02:00
Bill King
106473c4b5 Cleanup to use new waitForSignal function. 
Change-Id: Id47c81fc3c2d4448f26dd2432b73286501be1e26
Reviewed-on: http://codereview.qt-project.org/5297
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-09-21 14:01:41 +02:00
Bill King
690ed9f7ec More wait-for-project-refresh 
Change-Id: Ic08c7e66edbcf300d6643ea0139cf9eea1720e31
Reviewed-on: http://codereview.qt-project.org/4519
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-09-09 14:51:51 +02:00
Bill King
29838517ce Wait for project refresh before building. 
Change-Id: Ia5bbeec726168ecd0264ff351dd0eab9b9af31d2
Reviewed-on: http://codereview.qt-project.org/4512
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-09-09 11:11:14 +02:00
Christian Stenger
991e19b40b Refactoring build functions, enhancing signal handlers 
Added functionality to remove the need to clean settings by yourself

Change-Id: If2d95618d5e77e30480d0ca763ad7ce632f2d094
Reviewed-on: http://codereview.qt.nokia.com/3984
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-08-31 16:37:00 +02:00
Bill King
507d260bd4 Fixes openProject, also tests multiple target selection and building. 
Change-Id: I4a5aaea2eca940c3ffcf8458b5cc0afce591b63e
Reviewed-on: http://codereview.qt.nokia.com/3886
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-08-31 14:09:38 +02:00
Bill King
f4ba61528e Remove the need to set global scripts directory. 
Change-Id: I8f937120f7b151b0c68480a898fd953ae542bf69
Reviewed-on: http://codereview.qt.nokia.com/3662
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2011-08-29 12:36:31 +02:00
Christian Stenger
648e985cd6 Improved check for last build status 
Change-Id: I18f8839daeb5f21957b9ab8102341f25dd77720d
Reviewed-on: http://codereview.qt.nokia.com/3651
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-08-26 12:21:20 +02:00
Bill King
756fb87983 Initial commit of squish tests for creator. 
Change-Id: Ic499b3c36d37f9789276f60a41642ffc7ee816d1
Reviewed-on: http://codereview.qt.nokia.com/3047
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-08-26 09:46:31 +02:00