diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-13 19:07:06 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-14 10:22:26 +0000 |
| commit | e9cac99f3796740ea93b23b0fe893fc880e0b5d4 (patch) | |
| tree | 7bb8d41c520e9d59bd2a39cf53ab8c948db57511 /tools/qmlcachegen | |
| parent | 82525a2b3861ad695c156c2cac4239134f8ac922 (diff) | |
Regenerate projects
Change-Id: I38044c382e4d84b5865a19cdd04cc8922bd72a77
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tools/qmlcachegen')
| -rw-r--r-- | tools/qmlcachegen/.prev_CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tools/qmlcachegen/CMakeLists.txt | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/tools/qmlcachegen/.prev_CMakeLists.txt b/tools/qmlcachegen/.prev_CMakeLists.txt index d4ad2adb6d..d509bad865 100644 --- a/tools/qmlcachegen/.prev_CMakeLists.txt +++ b/tools/qmlcachegen/.prev_CMakeLists.txt @@ -20,10 +20,9 @@ add_qt_tool(qmlcachegen ) #### Keys ignored in scope 1:.:.:qmlcachegen.pro:<TRUE>: -# CMAKE_BIN_DIR = "$$cmakeRelativePath$$[QT_HOST_BINS],$$[QT_INSTALL_PREFIX]" +# CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])" # QMAKE_SUBSTITUTES = "cmake_config_file" # QMAKE_TARGET_DESCRIPTION = "QML" "Cache" "Generator" -# _LOADED = "cmake_functions" "qt_build_paths" "qt_tool" # _OPTION = "host_build" # build_integration.files = "qmlcache.prf" "qtquickcompiler.prf" # build_integration.path = "$$[QT_HOST_DATA]/mkspecs/features" @@ -36,10 +35,10 @@ add_qt_tool(qmlcachegen ##################################################################### #### Keys ignored in scope 2:.:.:qmlcachegen.pro:prefix_build: -# INSTALLS = "build_integration" "cmake_build_integration" +# INSTALLS = "cmake_build_integration" "build_integration" #### Keys ignored in scope 3:.:.:qmlcachegen.pro:else: -# COPIES = "build_integration" "cmake_build_integration" +# COPIES = "cmake_build_integration" "build_integration" #### Keys ignored in scope 4:.:.:qmlcachegen.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_: # CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/" diff --git a/tools/qmlcachegen/CMakeLists.txt b/tools/qmlcachegen/CMakeLists.txt index 253421bbc4..4d82c9ce3e 100644 --- a/tools/qmlcachegen/CMakeLists.txt +++ b/tools/qmlcachegen/CMakeLists.txt @@ -21,10 +21,9 @@ add_qt_tool(qmlcachegen ) #### Keys ignored in scope 1:.:.:qmlcachegen.pro:<TRUE>: -# CMAKE_BIN_DIR = "$$cmakeRelativePath$$[QT_HOST_BINS],$$[QT_INSTALL_PREFIX]" +# CMAKE_BIN_DIR = "$$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])" # QMAKE_SUBSTITUTES = "cmake_config_file" # QMAKE_TARGET_DESCRIPTION = "QML" "Cache" "Generator" -# _LOADED = "cmake_functions" "qt_build_paths" "qt_tool" # _OPTION = "host_build" # build_integration.files = "qmlcache.prf" "qtquickcompiler.prf" # build_integration.path = "$$[QT_HOST_DATA]/mkspecs/features" @@ -37,10 +36,10 @@ add_qt_tool(qmlcachegen ##################################################################### #### Keys ignored in scope 2:.:.:qmlcachegen.pro:prefix_build: -# INSTALLS = "build_integration" "cmake_build_integration" +# INSTALLS = "cmake_build_integration" "build_integration" #### Keys ignored in scope 3:.:.:qmlcachegen.pro:else: -# COPIES = "build_integration" "cmake_build_integration" +# COPIES = "cmake_build_integration" "build_integration" #### Keys ignored in scope 4:.:.:qmlcachegen.pro:CMAKE_BIN_DIR___contains___^\\.\\./._x_: # CMAKE_BIN_DIR = "$$[QT_HOST_BINS]/" |