Commit Graph

66 Commits

Author SHA1 Message Date
Robert Loehning
aac77eecb9 Squish: Replace Qt version 5.6.1 with 5.14.1
Task-number: QTCREATORBUG-22111
Change-Id: Iaae052e73a264252e399bd0992be4b420e2799ae
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-10 15:59:08 +00:00
Christian Stenger
9a1135776d Squish: Adapt to changed build menu entries
Change-Id: I0b9ceb8024e42960a2b915ed5e59ae5d33fa4207
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-01-29 06:12:29 +00:00
Robert Loehning
a7bbcb8e39 Squish: Stabilize tst_simple_analyze
The total time may be more than 1s when
the CPU is busy. Ignoring this column.

Change-Id: I9c80fecb618bcad1bc3e7922c5a573964cd019a4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-02-04 13:14:24 +00:00
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
2fb270c77f Squish: Update tst_simple_analyze
Change-Id: I2cbe39a225760f53d70487e105e2b45fd4e16d33
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-04 11:24:10 +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
fdc4ac41d9 Squish: Replace Qt 5.3 kit with Qt 5.10
This patch just changes the minimum for replacing the kits while
keeping the tests running. Further updates to the tests should
be done in separate patches.

Task-number: QTCREATORBUG-19440
Change-Id: I25ce60ad0a47678dba4352a4b2601ca1cdd4741d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-16 14:15:11 +00:00
Ulf Hermann
13ba063696 QmlProfiler: Fix translations and tests for statistics view
The statistics view is not called "events" anymore.

Task-number: QTCREATORBUG-19658
Change-Id: Iff4375d3dc0cf5d82d118244698887818f924c07
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-01-26 11:26:48 +00:00
Robert Loehning
6d919cd85a Squish: Stabilize tst_simple_analyze
Change-Id: I3875451ee263a97f0919f08c96318502b49922f4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-29 13:25:58 +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
a96f755be8 Squish: Improve object name
Change-Id: Ic0286a659f08c1ee7258ca5c9a13b2e3df647ed8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-20 10:17:28 +00:00
Robert Loehning
621ad7bd77 Squish: Update tst_simple_analyze
Change-Id: I64efc1fa64ba1dd3eea065a39a56eb286ab78b10
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-20 10:17:19 +00:00
Robert Loehning
5dd44e0a7b Squish: Update testdata for tst_simple_analyze
Project template was changed in
b18e084fc0

Change-Id: Ib37b1e5c5c30f75bac302d605403755c8f450fbf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-12 09:50:02 +00:00
Robert Loehning
81bae84411 Squish: Stabilize tst_simple_analyze
...by giving the Quick app more time to finish.

Change-Id: I788715bcfa0949ee1873295eb869fb4e04fd00b1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-01 16:21:39 +00:00
Robert Loehning
9f3eaaf5e2 Squish: Use shadow builds in tst_simple_analyze
So MSVC2010 and MSVC2013 don't get in their way.

Change-Id: Ie4696ce1afa695a6db109945ab506ce195322656
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-26 09:15:21 +00:00
Robert Loehning
ff9a49f99f Squish: Adjust expected times in tst_simple_analyze
Change-Id: I950d5bdebaaddd63a7a1b0994337fdcb9b806e23
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-12 13:51:29 +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
Christian Stenger
6ffbb88b7b Squish: Adapt to changed tool tip
Change-Id: Ib6f01cdad6a8e54010ad455cb7e9322d6311dc12
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2016-04-06 15:16:47 +00:00
Robert Loehning
1b0d00ef0c Squish: Update tst_simple_analyze
Change-Id: I902e1e70bd195cf0108efdc8893927a101e93a42
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-10 12:32:51 +00:00
Robert Loehning
ed1f8b9d1f Squish: Update tst_simple_analyze
Change-Id: Ifba9af5446fec3daa42aa9794a26d02e23b8459d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-24 14:05:08 +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
f3400f62cd Squish: Remove workaround for fixed bug
Change-Id: Ifac94dfc27b0cb5f230d7b137bafabaa82a6773c
Task-number: QTCREATORBUG-14307
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-01 08:59:08 +00:00
Robert Loehning
73fbf3afd1 Squish: Don't check state of closed bug
The bug is fixed in master so checking for
it here in 3.5 is wrong and causes fails.

Change-Id: Idd429cf61734c869ada2728151b2bf6f82f6a240
Task-number: QTCREATORBUG-14307
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-09-11 12:15:20 +00:00
Christian Stenger
f54b7d63cc Squish: Fix tst_simple_analyze
Change-Id: Iac334d37a1cf6a85d4f85d09165503f9bca8ce91
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2015-07-13 14:43:11 +00:00
Robert Loehning
da2b1cfa4e Squish: Don't analyze kits which take too long
Change-Id: I18e2cb163f2aef81ca34994a38ceb4865b2ae5ad
Task-number: QTCREATORBUG-14307
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-19 09:08:56 +00:00
Robert Loehning
559d8dc203 Squish: Fix tst_simple_analyze
Change-Id: I56a7c2a651fc9d2701cf650279a677856b6cf84c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-03-09 14:36:56 +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
Robert Loehning
07a52d1ae6 Squish: Remove Qt4 compatibility code
Thank you Qt4 for all the good times we had together.
Farewell.

Change-Id: If0e81b71a97524bb0c84ea5bbcba4c29244a0a5e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-31 14:52:03 +01:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
2014-10-14 15:36:16 +02: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
Ulf Hermann
8b3b868f4c QmlProfiler: Rename JavaScript view to "V8"
The fact that the separate JavaScript view only works with versions of
Qt that use the V8 JavaScript engine is frequently confusing users.
JavaScript events for newer versions of Qt are integrated into the
Events and Timeline views, making the separate JavaScript view obsolete.
For those users who already know it and who are still using Qt 5.0 and
5.1 "V8" will be recognizable. For others "V8" won't mean anything and
they'll ignore it.

Change-Id: Iac0d89db24a3677e47b978a152cfc25c01f9c2b6
Task-number: QTCREATORBUG-12766
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-08-18 10:33:13 +02:00
Christian Stenger
881632c390 Squish: Fix expected values in tst_simple_analyze
"Source code not available" is shown again - now they're displayed
from the view instead of being added explicitly to the model.
See ccf871aa20.

Change-Id: I8c370008005c9453cc86dacb410b310b972e03eb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-03 10:02:54 +02:00
Robert Loehning
b415cc3cac Squish: Update expected values of tst_simple_analyze
Change-Id: I8b11ebe20cfa432a37858c582a1a36b9bd718ce2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-06-27 12:17:17 +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
92239b6753 Squish: Verify elapsed time from QML Profiler
Task-number: QTCREATORBUG-11952
Change-Id: I1ef4b5ec7dfcf56cb7c07882b8e091fd84b26121
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-04-04 15:05:46 +02:00
Christian Stenger
9637e65698 Squish: Fix tst_simple_analyze
Used template has changed - correcting the expected values.

Change-Id: I8d60f3c75f1f88d80c31f68276ac083e2215e8f7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-11 14:20:17 +01:00
Christian Stenger
d602a942a9 Squish: Fix tst_simple_analyze on Windows
Change-Id: I7088e237de1f1c602aa79abe19d0a656693cfa20
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-02-11 12:46:41 +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
Christian Stenger
fca97a53d4 Squish: Clear analyzer results after verification
Change-Id: Ic475704773770d7d17361c96947734681e959fea
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-01-21 23:09:41 +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
1734e368b6 Squish: Improve waiting in tst_simple_analyze
Change-Id: I430e9190beab25f51b187c007c0d7624810c2509
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-12-19 13:44:26 +01:00
Christian Stenger
d94d343f4d Squish: Perform additional Profiler test
Change-Id: I9ca615f89ac772fc87b9dc91ed2fbc42a3b763a3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-12-12 13:04:28 +01:00
Christian Stenger
ff2d6aa8f7 Squish: Fix tst_simple_analyze
The JavaScript tab is now disabled if there's no content at all.

Change-Id: I00e0a6adabd42d0783ad6833fe707323f5a69aae
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-11-26 16:10:19 +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