diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-08-09 17:42:05 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-09 15:56:54 +0000 |
| commit | d5fac40c06d5b532c6d9c50201493528e29063de (patch) | |
| tree | 3fe1887c0c77831f9b9e530ff2377ed6f2058aae /tools | |
| parent | 381e1585df5c255b1ce79483268d722f2bb46b65 (diff) | |
Fix qml tool start-up
Re-generate the file to include the missing slash in the prefix fix from
qtbase and add a special section to exclude the qml files from
qtquickcopmiler, as main.cpp expects to read the files verbatim.
Change-Id: I9b6bdb887c793c9cb4725693ab691a8ad86f2db3
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/.prev_CMakeLists.txt | 18 | ||||
| -rw-r--r-- | tools/qml/CMakeLists.txt | 26 |
2 files changed, 31 insertions, 13 deletions
diff --git a/tools/qml/.prev_CMakeLists.txt b/tools/qml/.prev_CMakeLists.txt index c60900a954..67dee9c4ba 100644 --- a/tools/qml/.prev_CMakeLists.txt +++ b/tools/qml/.prev_CMakeLists.txt @@ -16,12 +16,16 @@ add_qt_tool(qml ) # Resources: -add_qt_resource(qml "qml" PREFIX "qt-project.org/QmlRuntime" FILES - conf/content/resizeItemToWindow.qml - conf/content/resizeWindowToItem.qml - conf/default.qml - conf/resizeToItem.qml - resources/qml-64.png) +add_qt_resource(qml "qml" + PREFIX + "/qt-project.org/QmlRuntime" + FILES + conf/content/resizeItemToWindow.qml + conf/content/resizeWindowToItem.qml + conf/default.qml + conf/resizeToItem.qml + resources/qml-64.png +) #### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: @@ -45,7 +49,7 @@ extend_target(qml CONDITION TARGET Qt::Widgets #### Keys ignored in scope 4:.:.:qml.pro:WIN32: # RC_ICONS = "resources/qml.ico" -#### Keys ignored in scope 5:.:.:qml.pro:APPLE_OSX: +#### Keys ignored in scope 5:.:.:qml.pro:APPLE: # ICON = "resources/qml.icns" # OTHER_FILES = "resources/Info.plist" # QMAKE_INFO_PLIST = "resources/Info.plist" diff --git a/tools/qml/CMakeLists.txt b/tools/qml/CMakeLists.txt index b5f0abaee0..bd8d32f880 100644 --- a/tools/qml/CMakeLists.txt +++ b/tools/qml/CMakeLists.txt @@ -16,13 +16,27 @@ add_qt_tool(qml Qt::Qml ) -# Resources: -add_qt_resource(qml "qml" PREFIX "qt-project.org/QmlRuntime" FILES - conf/content/resizeItemToWindow.qml - conf/content/resizeWindowToItem.qml +# special case begin +set_source_files_properties( conf/default.qml conf/resizeToItem.qml - resources/qml-64.png) + conf/content/resizeItemToWindow.qml + conf/content/resizeWindowToItem.qml + PROPERTIES QT_SKIP_QUICKCOMPILER 1 +) +# special case end + +# Resources: +add_qt_resource(qml "qml" + PREFIX + "/qt-project.org/QmlRuntime" + FILES + conf/content/resizeItemToWindow.qml + conf/content/resizeWindowToItem.qml + conf/default.qml + conf/resizeToItem.qml + resources/qml-64.png +) #### Keys ignored in scope 1:.:.:qml.pro:<TRUE>: @@ -46,7 +60,7 @@ extend_target(qml CONDITION TARGET Qt::Widgets #### Keys ignored in scope 4:.:.:qml.pro:WIN32: # RC_ICONS = "resources/qml.ico" -#### Keys ignored in scope 5:.:.:qml.pro:APPLE_OSX: +#### Keys ignored in scope 5:.:.:qml.pro:APPLE: # ICON = "resources/qml.icns" # OTHER_FILES = "resources/Info.plist" # QMAKE_INFO_PLIST = "resources/Info.plist" |