diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-08-09 12:47:55 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-08-09 11:50:11 +0000 |
| commit | 95c27e325f47cff168a85c21b4b9e592168384f9 (patch) | |
| tree | c70a0f84751a43c433b3e88c49f7e6ee4e63d1de /tests/auto/widgets/kernel/qwidget | |
| parent | aaec0726234f1e7eb23087b04426591b81307e5a (diff) | |
Fix add_qt_resource behavior with regards to unspecified prefixes
This change makes the PREFIX parameter a required parameter if the
target does not specify a default. This way the behavior is clear when
reading the code: add_qt_resource() without PREFIX means it must come
frmo the target.
Change-Id: I79024e70e7b4d32a5164b93aa08ec9ff409b2d39
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Diffstat (limited to 'tests/auto/widgets/kernel/qwidget')
| -rw-r--r-- | tests/auto/widgets/kernel/qwidget/CMakeLists.txt | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt index 86d02ac733..fca2c313a1 100644 --- a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### add_qt_test(tst_qwidget + GUI SOURCES tst_qwidget.cpp LIBRARIES @@ -13,17 +14,19 @@ add_qt_test(tst_qwidget Qt::TestPrivate Qt::WidgetsPrivate PUBLIC_LIBRARIES - Qt::Core Qt::Gui - Qt::Test Qt::Widgets ) # Resources: -add_qt_resource(tst_qwidget "qwidget" FILES - geometry-fullscreen.dat - geometry-maximized.dat - geometry.dat) +add_qt_resource(tst_qwidget "qwidget" + PREFIX + "/" + FILES + geometry-fullscreen.dat + geometry-maximized.dat + geometry.dat +) #### Keys ignored in scope 1:.:.:qwidget.pro:<TRUE>: @@ -33,7 +36,7 @@ add_qt_resource(tst_qwidget "qwidget" FILES ## Scopes: ##################################################################### -extend_target(tst_qwidget CONDITION APPLE_OSX +extend_target(tst_qwidget CONDITION APPLE SOURCES tst_qwidget_mac_helpers.mm PUBLIC_LIBRARIES |