From 771b6f59e2df79f5a0cbf50b592d73ec131cc6a9 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 11 Oct 2019 13:58:33 +0200 Subject: Fix up qlalr calls in preparation for API change in qtbase The target should come first, for consistency. Change-Id: I305781c119883189852fc5299522766bed90f09b Reviewed-by: Alexandru Croitor --- src/qml/CMakeLists.txt | 2 +- src/qmldevtools/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index 0837084af5..2be9e58bc9 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -343,7 +343,7 @@ add_qt_module(Qml # special case begin qt_declarative_write_tag_header(Qml) set(_qt_qlalr_flags "--no-debug" "--qt") -qt_process_qlalr("${CMAKE_CURRENT_SOURCE_DIR}/parser/qqmljs.g" Qml "${_qt_qlalr_flags}") +qt_process_qlalr(Qml "${CMAKE_CURRENT_SOURCE_DIR}/parser/qqmljs.g" "${_qt_qlalr_flags}") qt_declarative_generate_reg_exp_jit_tables(Qml) # special case end diff --git a/src/qmldevtools/CMakeLists.txt b/src/qmldevtools/CMakeLists.txt index 8a336a9ca5..cff3b652ac 100644 --- a/src/qmldevtools/CMakeLists.txt +++ b/src/qmldevtools/CMakeLists.txt @@ -53,7 +53,7 @@ add_qt_module(QmlDevTools # special case begin # Need to generate the parser files as in Qml module. set(_qt_qlalr_flags "--no-debug" "--qt") -qt_process_qlalr("${CMAKE_CURRENT_SOURCE_DIR}/../qml/parser/qqmljs.g" QmlDevTools "${_qt_qlalr_flags}") +qt_process_qlalr(QmlDevTools "${CMAKE_CURRENT_SOURCE_DIR}/../qml/parser/qqmljs.g" "${_qt_qlalr_flags}") # Need to propagate some of the include directories from Qml via QmlDevToolsPrivate # for other tools, and also for the main QmlDevTools module, -- cgit v1.2.3