Commit Graph

5903 Commits

Author SHA1 Message Date
Christian Stenger
3573b2db7f Squish: Fix wizard template categories
Change-Id: Ifb26430c429dc41ea73789a210f93b80e0e8d3f2
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-01-27 12:07:33 +00:00
Robert Loehning
5a05c78647 Squish: Skip Python projects in tst_create_proj_wizard
Change-Id: I82cd203a17391715428041e64b381379ab34da9e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-01-22 11:54:10 +00:00
Christian Stenger
cadb00cdf3 Squish: Fix label parent
Change-Id: Idf0620e5d810a05e7d01f98e9cbd04713bd0cbe6
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-01-21 17:54:22 +00:00
Robert Loehning
68fbd15299 Squish: Remove old hack for the Mac
Change-Id: I8655b8fe5a1a448995a3798fd587a01919129434
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-01-21 10:20:07 +00:00
Cristian Adam
08202b9110 CMake Build: rename target qmljs to QmlJS
This is in sync with what qmake and qbs project have.

Change-Id: Id82bbd933a8331c3e2032e5068323c183b2a1814
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-01-16 17:32:24 +00:00
Christian Stenger
0e4f15996b Tests: Fix build on macOS as well
Amends d6745b488b.

Change-Id: Ic33b642347f2f6f553e674122775e0e07856c2f9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-01-10 08:26:35 +00:00
Alessandro Portale
25323be13d Utils: Fix setting of minimal height of InfoLabels in QFormLayout
Calling setMinimumHeight is not compatible with QFormLayout if the label
has multiple lines. Overriding minimumSizeHint on the other hand is.

Change-Id: Id2167b295620322cec75035d7cc7125cc3221c4d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-01-09 12:26:57 +00:00
Christian Stenger
2cc3ac9bbd Tests: Fix build on Windows
Change-Id: I5679077ac3955e65dcce55cf229f10c245543236
Reviewed-by: hjk <hjk@qt.io>
2020-01-09 12:11:08 +00:00
Christian Stenger
d6745b488b Tests: Fix build
Broke with a7dd0e50a2.

Change-Id: Ia58bae8e641e50d14d776b689f8ded17e306f4d9
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-01-07 06:30:26 +00:00
Eike Ziller
92546d0983 Merge remote-tracking branch 'origin/4.11'
Change-Id: I0657cee6b87eea7b3178548bebed85d5ac824519
2020-01-03 08:57:33 +01:00
Alessandro Portale
4a8e8f2b6e CMake build system: Depend qml tests on configuration
Don't build qml auto tests if the QmlJSTools plugin is disbled in the
configuration.

Change-Id: I05217446b087a9ab201c0ee8b1d37d5a0ddd6c8e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-12-23 10:11:25 +00:00
Alessandro Portale
a766d89b40 CMake build system: Depend QmlProjectManager tests on configuration
Don't build QmlProjectManager tests if the QmlProjectManager plugin is
disbled in the configuration.

Change-Id: I354a23567528d02ba9d4207202800ff0175d9a6b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-12-23 10:11:21 +00:00
Nikolai Kosjar
26693e8212 Revert "Clang: Stop enabling exceptions explicitly"
This reverts commit b114f77d8a as
"--driver-mode=cl" apparently still disables exceptions.

Task-number: QTCREATORBUG-23000
Change-Id: I9c49d971fafda5e1aca8445f8921e50f323d368f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-12-20 22:46:02 +00:00
Nikolai Kosjar
4fdd944617 Clang: Fix removing gcc internal include paths
Amends 5165c037eb.

Gentoo has the standard library headers installed in e.g.
<installdir>/include/g++-v8 and we excluded those. MinGW with the
standard library headers in <installdir>/include/c++ was whitelisted.

Instead of whitelistening more dirs that could contain standard library
headers, regard

  <installdir>/include
  <installdir>/include-fixed

as gcc internal include paths to remove. These seem to be stable across
distributions.

Task-number: QTCREATORBUG-23330
Change-Id: I44965d2030b4ea5a9dd269400faf19c3df89f5a6
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-12-20 22:45:31 +00:00
Alessandro Portale
cd86aa05d6 Utils: Introduce InfoLabel
Utils::InfoLabel is meant to replace around 30 custom implementations of
a QHBoxLayout with an pixmap QLabel and a text QLabel.

Instead of fiddling with pixmaps, the user of InfoLabel can set an enum
for info/warning/etc... type. Internally, a globally shared QIcon is
used. The usage of QIcon ensures that @1x, @2x and hybrid cases are
handled.

Task-number: QTCREATORBUG-23346
Change-Id: I0f91a21e64f095db14837512263c4becbb2c13d7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-19 14:02:10 +00:00
Eike Ziller
3b583061a2 Merge remote-tracking branch 'origin/4.11'
Change-Id: I066040bd5e762d580c8a903122f451f2193df186
2019-12-19 12:21:00 +01:00
Robert Loehning
d9a26acbb8 Squish: Don't change suffix .qrc when testing renaming
...since it's not expected to work anyway.

Task-number: QTCREATORBUG-23167
Change-Id: I165dbcbc206372475a8d9128b1888b38b9f82367
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-18 12:40:03 +00:00
hjk
e109b731ad Utils: Rename FilePathList to simply FilePaths
The exact storage type does not really matter here.

Change-Id: Iefec40f0f5909c8e7ba3415db4a11962694e1b38
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-12-18 08:43:18 +00:00
Christian Stenger
019e384495 Rename pro file back to its old name
Partially revert for 3edfced05f.

Change-Id: I7eba8d709cf148bcba9c70162cdfc8bfd09375fc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-12-18 06:23:57 +00:00
Alessandro Portale
3edfced05f CMake build system: Add manual tests
With tst_manual_widgets_crumblepath as first candidate.

Change-Id: If66b53a459865903b2028966ac2d6d9357356aed
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-12-17 14:59:20 +00:00
Orgad Shaneh
49f6b0146a Merge remote-tracking branch 'origin/4.11'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/mcusupport/mcusupportrunconfiguration.cpp
	src/plugins/python/pythonproject.cpp
	src/plugins/qmakeprojectmanager/qmakestep.cpp
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I22507be28fd80c49c9fee0dff5937a40db176a82
2019-12-07 18:39:54 +02:00
David Schulz
a07053853b CMakeBuild: fix unittest msvc compile
by adding /bigobj cxx flag for msvc builds

Change-Id: I73e6afc820556454c2886fd2a55b296229c50649
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-12-05 11:56:36 +00:00
Christian Stenger
5311f8c20f Squish: Fix compiler detection
Find clang and clang++ in more than one location. If they could
be found in more than a single path provided inside PATH we
expected only the first occurrence.

Change-Id: Ibcd7b7b6dff1153fd4b52b055c0fb2a0c5d9d7fc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-12-04 06:28:45 +00:00
Christian Stenger
811db1129c Squish: Remove outdated check
Parsing nowadays starts only after selecting a kit.

Change-Id: I2beced906073f3041e9dcb021ac6ef5f03f144a5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-12-03 05:46:16 +00:00
Eike Ziller
4e6142c932 Merge remote-tracking branch 'origin/4.11'
Conflicts:
	src/plugins/autotest/testresultspane.cpp
	src/plugins/cmakeprojectmanager/cmaketool.cpp

Change-Id: Iade695ac9cab8bf3e3a1abd6e2c71f4a19132ac0
2019-11-21 22:18:35 +02:00
Robert Loehning
4a17ac7760 Squish: Update tst_rename_file
Change-Id: I1b7e8ef7c112e01ed2403c348234a482b050cf49
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-20 16:04:03 +00:00
hjk
e8fe082bf9 Debugger: Swap BREAK and unused() in most dumper test
To avoid optimizing.

Change-Id: I43b39746811a822a0b5677920f9dc2f149291bc0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-20 11:31:57 +00:00
Christian Stenger
a87293d1c4 Squish: Update expected tool tips
Change-Id: Ibde199b8f88448c9f0e7b235f7ede57735718201
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-11-15 22:58:52 +00:00
Christian Stenger
ebcde98b72 Squish: Re-enable testing Qt Quick 2 Extension Plugin wizard
This effectively reverts commit 4f2f86b5bf.
Additionally fixes the expected kits for this template.

Change-Id: Ie90f113894d331fa4023b8c58f30da5c4886c76d
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-11-15 16:01:51 +00:00
Christian Stenger
a08a5499e9 Squish: Fix expected ui elements and page order
The wizard had been transformed to use the
JsonWizard nowadays.
Order of wizard pages has slightly changed to be
consistent with the rest of the wizards.

Change-Id: I841349d3b20dbc03a56a3dc4d15f717d0d21acdb
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-11-15 15:48:33 +00:00
Robert Loehning
775c78eca8 Squish: Stabilize selectBuildConfig(...)
Change-Id: Iba111e8cbbe652dd488b4dc91c58b92f53eccba3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-15 12:46:13 +00:00
Eike Ziller
990f52957d Fix mapReduce with QVector input
The iterator type of QVector is just (const) T *, so we cannot call
::reference on it directly. Access via std::iterator_traits instead.

This is especially interesting in the light of Qt 6 replacing QList with
QVector.

Change-Id: Ib4e84f61302822e51b8984e2a44fea874efce81d
Reviewed-by: hjk <hjk@qt.io>
2019-11-12 13:48:24 +00:00
Christian Stenger
8866153c2a Squish: Fix test for welcome page
Amends cf3772ca77.

Change-Id: I3b98f4493db130f062982a5a8b39e334d5b6b49f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-11-12 11:22:40 +00:00
Christian Stenger
cfd419cc0c Squish: Adapt to changed ui
Change-Id: Icf371af4de7aadbcab5cdf53a8095b26a7150aba
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-11-12 11:22:31 +00:00
Eike Ziller
646c7860cb Merge remote-tracking branch 'origin/4.11'
Conflicts:
	src/plugins/genericprojectmanager/genericprojectplugin.cpp
	src/plugins/projectexplorer/environmentaspect.cpp
	src/plugins/projectexplorer/environmentaspect.h
	src/plugins/projectexplorer/environmentaspectwidget.cpp

Change-Id: Id21d62cf14419febd1e06c9b429fcdf4501c0eaf
2019-11-11 12:58:11 +01:00
Robert Loehning
cf3772ca77 Squish: Update testing ProjectWelcomePage
Used by tst_session_handling and tst_WELP02.

Change-Id: I28bdececac39719372834c373f82ac9e99beb613
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-11-05 05:42:53 +00:00
Eike Ziller
04f0123c43 Merge remote-tracking branch 'origin/4.11'
Change-Id: Ie951c531a5b2efd8e6b972c4d04b7f1c681c8ef9
2019-11-04 14:41:36 +01:00
Eike Ziller
53819123e7 Simplify RPATHs for qmake build
Use central rpath.pri for setting RPATHs and qttestrpath.pri for tests.
Simplify install names of plugins and libraries on macOS to be just
@rpath/libName, which follows convention better and makes setting up
RPATHs easier.

Preparation for moving tools one directory level down on macOS, to
be able to add a qt.conf for the tools generically.

Task-number: QTCREATORBUG-23120
Change-Id: I16625d48904abd3a7f4c2ad7bbba5916cdc400cd
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-11-04 10:31:55 +00:00
Eike Ziller
04bd6e39c8 Merge remote-tracking branch 'origin/4.11'
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp

Change-Id: I8ea57eba526ab830608fd928c28771c5441749f8
2019-11-01 15:31:19 +01:00
Christian Stenger
7a4cf827d9 Tests: Provide generic project for manual testing
For now Linux-only.

Change-Id: I88185e18222478de41564ec8be0239357cfb4b30
Reviewed-by: hjk <hjk@qt.io>
2019-10-30 12:59:46 +00:00
Robert Loehning
aad5fb339d Squish: Update QmlJSEditorWidget
Change-Id: I783849086d59d51d51dfbc560e3d6c8e298ccd71
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-10-30 11:39:36 +00:00
Robert Loehning
40fb68d18d Squish: Remove outdated comment
Change-Id: I4aeee19ada28ad536994d3b6ec164429b3fc90c4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-10-29 18:17:46 +00:00
Robert Loehning
4f2f86b5bf Squish: Skip testing Qt Quick 2 Extension Plugin wizard
We're not doing anything in it anyway.

Change-Id: I5d790d98c8952e6167bfe241af5490cf18622890
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-10-29 12:36:43 +00:00
Eike Ziller
bea3a8fa6f Merge remote-tracking branch 'origin/4.11'
Change-Id: I66389d88d5a60c6c86547b93cca945af42aa807b
2019-10-28 11:48:31 +01:00
Christian Stenger
bf698f5a2f Unittest: Fix warning
Change-Id: Ie78646d82786ad8836f289ba53382dad2d51d3f5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-25 05:21:20 +00:00
Christian Stenger
99deb21b7a Squish: Adapt verification of kits
Kits are nowadays displayed if configured, but disabled
if they do not fit for the respective project.

Change-Id: If04a20afde2fc1ada643e45d5eea33e6ace7a4f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-10-24 09:37:12 +00:00
Christian Stenger
8db784349e Tests: Fix compile after clean up
Amends 6371725dbf.

Change-Id: If583fba25ccb92756938bd7127be9461d289a680
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-10-23 12:19:45 +00:00
Nikolai Kosjar
8f6eb41cad Clang: Ensure that platform codegen flags get also filtered
Leave the function addExtraCodeModelFlags() around as it's used by
ClangPchManager::ProjectUpdater::toolChainArguments().

This allows us to filter out excess target arguments in a follow-up
change.

Change-Id: I742d713dd1ca6c391ba77c52555dcf4e94cc2ff9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-22 11:46:42 +00:00
Robert Loehning
35fe01c6e9 Squish: Update expected label text
Change-Id: If17465530ca06f5d4d1ae06db1f8175ecdd92fd1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-10-21 09:34:53 +00:00
Christian Stenger
cc67ad8736 Squish: Adapt handling for project creation
Some templates got an additional page for handling translations.

Change-Id: I420e4f1bd8be5a30056220abd73b3f9da44d5047
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2019-10-21 09:34:20 +00:00