Commit Graph

5985 Commits

Author SHA1 Message Date
Christian Stenger
33b091bd40 QmlJS: Fix compile
..in general, with tests, and when using a namespaced Qt.
Amends b09a48599e.

Change-Id: I99e275e10df5eed741d021911a360457f0d0d2e7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-04 08:22:12 +00:00
Orgad Shaneh
e4dab6b83e QmlJS: Fix compiler warning and add a missing include
qmljsdiagnosticmessage_p.h: In static member function ‘static QmlJS::Severity::Enum QmlJS::DiagnosticMessage::qtMsgTypeToKind(QtMsgType)’:
qmljsdiagnosticmessage_p.h:72:5: warning: control reaches end of non-void function [-Wreturn-type]
   72 |     }
      |     ^

Change-Id: I2183199bf257453e0af2998b739fae8c90f5c098
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2020-03-03 17:28:52 +00:00
Fawzi Mohamed
a670e203b1 Ensure that null dereference in test is not optimized away
Change-Id: Icf8eb894a8277353448f46b18d5d6614be1d2350
Reviewed-by: hjk <hjk@qt.io>
2020-02-27 16:08:09 +00:00
Robert Loehning
29ab2d3644 Squish: Break endless loop in tst_CSUP06
Change-Id: Id0762128a9c2b6b3cc15684ff1b35c38b3a64c97
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-26 11:07:56 +00:00
Christian Stenger
5d3e56b3b4 QmlDesigner: Fix compile with Qt5.11 and building tests
Change-Id: I96dea7de0d185c67ea3a26a42de0805bd60dc1d1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-02-24 13:40:07 +00:00
Robert Loehning
7eda08f600 Squish: Directly click mode selector
The tooltip doesn't show up on Windows anymore unless
you manually move the mouse.

The positioning has proven to be stable, so we don't
need to double-check using the tooltip anymore.

Change-Id: I92400d1fa273d4fb6a011cdf00c3b127c06764d5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-24 10:50:34 +00:00
Robert Loehning
fd2653bdc2 Squish: Remove outdated error handling
Change-Id: If3bb6f8dd5c79e11139801623f63ce88ea46cf42
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-19 11:58:57 +00:00
Robert Loehning
0b6386d1f8 Squish: Update QtOptionsPageWidget
Fixes error in tst_default_settings

Change-Id: I927edb0cab7c73a4830272cf6fb2f655cee4cd8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-18 14:43:52 +00:00
Robert Loehning
3e9437d8c5 Squish: Update chooseTargets()
Fixes tst_cmake_speedcrunch

Change-Id: I154647ca2108676b4184170ef121649547c3fd41
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-18 14:42:34 +00:00
Robert Loehning
46e5d52238 Squish: Update addAndActivateKit
Fixes warning in tst_opencreator_qbs

Change-Id: I82ba025ebc6befd222dd8f47cabcff08ad2e584e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-18 14:41:41 +00:00
Christian Stenger
4205134847 Squish: Fix compiler toolchains on macOS
Change-Id: I95aa7f0c91bc538ec7ada3ea04a8285b5cbe5f9c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-02-17 14:06:31 +00:00
Robert Loehning
1ebb72b47f Squish: Update expected tooltips
Change-Id: I88c5757b1f3beda34773ec3738779094a8441c2f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-17 10:53:50 +00:00
hjk
d3d294cd81 ExtensionSystem: Some modernization
Mostly 'foreach'.

Change-Id: I5390d03bb5cc37c3674b61cea6f5d22bae554ed2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-14 09:50:07 +00:00
David Schulz
e3c7b72003 LanguageClient: introduce new type for gorgeous formatted errors
Change-Id: Ia76bd768bcb6d33ce66319dddf8cc355a41ffa31
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-12 11:25:01 +00:00
Robert Loehning
debc304bf8 Squish: Update detection of configured kits
Change-Id: Icade1feffde4a1b252175d8012c411a0a423748f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-11 12:04:26 +00:00
Robert Loehning
11abdb9ddc Squish: Fix error handling
Change-Id: I896ce824a0c75d47f7b123f80937e81793cc33e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-02-07 11:08:42 +00:00
hjk
a44bfdd779 Provide an empty default IPlugin::extensionsInitialized()
And remove all empy re-implementations.

Change-Id: I19f0b4e55c042c96693ecb89766f97f0a97b54ae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-07 10:21:34 +00:00
The Qt Project
183048b587 Merge "Merge remote-tracking branch 'origin/4.11'" 2020-02-05 11:00:37 +00:00
Eike Ziller
5c121d5791 Merge remote-tracking branch 'origin/4.11'
Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp

Change-Id: Ib54f1645ec70a9e6460a888a13190ede130bccca
2020-02-05 11:59:35 +01:00
Igor Sidorov
a9e40ad14c Add final specifies to classes
Warning -Wfinal-dtor-non-final-class in clang trunk

Change-Id: I2bf17064bf8898eab10b82b69583a283157766d0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-05 09:33:55 +00:00
Christian Stenger
93896c9832 Unit: Fix building without ClangRefactoring
Change-Id: Id2a4d9d030c4a36eebc88f93029d846f08870eac
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-02-04 06:43:22 +00:00
Cristian Adam
3890473500 CMake Build: Fix unittests
Change-Id: I4282f2f80b1d8d1d902ac8252b8a826ca0e459c6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-02-03 13:57:51 +00:00
Christian Stenger
1a86b68809 Squish: Fix test for session handling
Wait for project parsing on re-opening a session
that contains projects before trying to interact.

Change-Id: I631ee72573e1ff1fb115825aaf756489d02f18ab
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-02-03 12:04:23 +00:00
Christian Stenger
bae6e3f854 Squish: Fix test for project wizard
Skip Qt Creator Plugin template as it needs special
handling on the details page.

Change-Id: If2fbba31435d280bd99d78a929dfd057ea26feab
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-02-03 11:34:20 +00:00
Christian Stenger
dae4231e52 Squish: Adapt to changed UI
Change-Id: I8506d099dc0c0721e61d00af2abb1e4515cda38e
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-02-03 11:34:11 +00:00
Christian Stenger
0275e0fa6a Squish: Fix handling of enabling Qml Debugging
Amends 0168a42b72.

Change-Id: I71c32a94fa6de4f64d03c9c73681e30496c2560d
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-02-03 11:33:52 +00:00
Robert Loehning
837631a65a Squish: Remove pointless progressBarWait()
No progress bar will be shown there. This is only causing warnings.

Change-Id: I909f0395d24a3aaf6499fba81ca3af1da33c208f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-01-29 15:17:13 +00:00
Robert Loehning
72def2c625 Squish: Wait for project parsing after creating projects
There is a new progress bar titled "Updating Locator Caches". The
unspecific progressBarWait() will continue after that disappeared.
Project parsing did not even start then.

Change-Id: Iaa6b7c63ea5669aefa3f34329d8d6e4958ae4eab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-01-29 14:31:28 +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
Christian Stenger
3fe9975664 Squish: Adapt to changed UI
Change-Id: Ieff38dca10a0e65b743404d0563e87ad9abb0994
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-01-28 19:14:51 +00:00
Christian Stenger
0168a42b72 Squish: Fix tst_debug_empty_main
Change-Id: I5c484a46cf795feee17c200416c4cd303c189774
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-01-28 12:58:37 +00:00
Christian Stenger
51cc14c738 Squish: Close Link with Qt banner at startup
Change-Id: I02e9a1b4eecc21804a2570a72cbdc0b19ae4f7a1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-01-27 14:38:24 +00:00
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