Commit Graph

17 Commits

Author SHA1 Message Date
Christian Kandeler
fca94a8366 qbs build: Fix manual tests
- Remove dependency on project.withAutotests by adding local
{Qt,Cpp}Application overrides that alias QtcManualTest. This way, the
respective products are a QtcManualTest when inside Qt Creator, while
also working outside the source tree.
- Rename QtcManualtest to QtcManualTest. (The reason QtcAutotest is not
camel-cased is because "autotest" is a single word.)
- Plus some minor clean-ups.

Change-Id: Idd77191f0b433d6d7443c639eebda383ab110082
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-09-20 10:22:21 +00:00
Kai Köhne
56baf8c058 Remove GPL-3.0+ from license identifiers
Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0,
this applies only to a hypothetical newer version of GPL, that doesn't
exist yet. If such a version emerges, we can still decide to relicense...

While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only

Change was done by running

  find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \;

Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-06 11:15:13 +00:00
Eike Ziller
55fa109b59 CMake build: Use version-less Qt targets
Since we do not support Qt < 5.15 anymore, and as a first step
for getting rid of our special FindQt5.cmake.

Change-Id: Icc5dbaf9b0a3a622b1f609ff114b9decb6d2856c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-01-05 10:13:16 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
Jarek Kobus
ebd0dd6ebc Drop Qt5: Manual tests: Remove code below Qt 6.0.0
Change-Id: I87e267415ec84001ff594b3900ce8be4f0cadd73
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-07-26 16:52:02 +00:00
Christian Kandeler
d4b8739653 qbs build: Fix building with MSVC and Qt >= 6.3
Change-Id: I59439217575bdcc170f38382129fa5f13edb23e2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-17 15:24:00 +00:00
Christian Stenger
1652be1310 Tests: Provide some cmake files for manual tests
Add another option to mark a test as manual and use this for some
existing.
Manual tests will not be added as a ctest, but they can still get
executed explicitly.
Beside this allow to use a condition when using add_qtc_test().

Change-Id: I03d5397db36c0a2c9ee506a4214ed68fae6ad6e7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-15 08:21:40 +00:00
Eike Ziller
9d8a419d10 Remove qmake build files
Removes qmake as a build system for building Qt Creator itself.
Keep them for some tests that are not completely moved to CMake yet.

Change-Id: I846c6ef65626b6dfae6375fdc85d00677aa8c2fb
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-20 12:18:15 +00:00
Alessandro Portale
595a4a621d Tests: Avoid Qt6-related deprecation warnings
Qt::AA_EnableHighDpiScaling and Qt::AA_UseHighDpiPixmaps are deprecated

Change-Id: I36a289f00feeaa472ee911a567c2a6160e259317
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-26 14:00:14 +00:00
Alessandro Portale
9915418f90 Tests: Turn manual widget tests into tests
...they do not need to be "executables" anymore

Change-Id: Ided0fa85ae891df66add47e59a9d7245f880213c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-06-11 14:39:52 +00:00
Christian Stenger
ced96a480d CMake: merge binary directories of sub projects
...into top level. Exceptions are applied explicitly.

Change-Id: I59c54967dffc0bef2e8cc05c73763fcf18c12517
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-02-05 14:09:12 +00:00
Alessandro Portale
dce06016ef Include some existing manual tests in the Qbs build system
Change-Id: Iceb346c42ff798430fb4ee6887b34f89768f014b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-12-11 13:35:11 +00:00
Alessandro Portale
4c6e5c2ba0 Tests: Introduce theme selection combobox in manual widget tests
Instead of duplicating a couple of code lines and hardcoding the
used theme, create a commonly used QComboBox as theme selector.

The selected theme remains stored in the settings.

Change-Id: I78f0d59a5594e7cc4f899656caaae1bb7caab385
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-08-03 17:24:48 +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
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
Alessandro Portale
8895ef1ddb Utils: Add a manual test for Utils::CrumblePath
Using a small test app for testing the CrumblePath is less clumsy than
doing that in Qt Quick Designer.

Change-Id: I4a1d739aa303adfd799df33eb00fb8cd513304c3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-27 14:07:40 +00:00