diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-07-03 15:45:41 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-07-05 18:00:46 +0200 |
| commit | 36b253eebdf5169709475a8e9b4726f3d19a771b (patch) | |
| tree | 3b3ee2f62e5b1b34e3f64ed56e3c9508db9b76c5 /tools/qmlcachegen/qmlcachegen.pro | |
| parent | a056cb9595ea4a41c93f4c912719f9523b943d3b (diff) | |
Prepare Qt5QuickCompiler.cmake.in for Qt6
Increment all the version numbers. Replace
qtquick_compiler_add_resources with a warning and a call to
qt6_add_resources.
Task-number: QTBUG-85190
Change-Id: Ifed5449ab4d6312a57add870eee13175872146db
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tools/qmlcachegen/qmlcachegen.pro')
| -rw-r--r-- | tools/qmlcachegen/qmlcachegen.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmlcachegen/qmlcachegen.pro b/tools/qmlcachegen/qmlcachegen.pro index d6e4812e3f..d02746cff7 100644 --- a/tools/qmlcachegen/qmlcachegen.pro +++ b/tools/qmlcachegen/qmlcachegen.pro @@ -32,12 +32,12 @@ contains(CMAKE_BIN_DIR, "^\\.\\./.*") { load(qt_build_paths) equals(QMAKE_HOST.os, Windows): CMAKE_BIN_SUFFIX = ".exe" -cmake_config_file.input = $$PWD/Qt5QuickCompilerConfig.cmake.in -cmake_config_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake +cmake_config_file.input = $$PWD/Qt6QuickCompilerConfig.cmake.in +cmake_config_file.output = $$MODULE_BASE_OUTDIR/lib/cmake/Qt6QuickCompiler/Qt6QuickCompilerConfig.cmake QMAKE_SUBSTITUTES += cmake_config_file cmake_build_integration.files = $$cmake_config_file.output -cmake_build_integration.path = $$[QT_INSTALL_LIBS]/cmake/Qt5QuickCompiler +cmake_build_integration.path = $$[QT_INSTALL_LIBS]/cmake/Qt6QuickCompiler prefix_build: INSTALLS += cmake_build_integration else: COPIES += cmake_build_integration |