diff options
| author | Tim Jenßen <tim.jenssen@qt.io> | 2023-03-26 15:58:49 +0200 |
|---|---|---|
| committer | Tim Jenßen <tim.jenssen@qt.io> | 2023-03-26 16:26:18 +0200 |
| commit | feabda3aa78b7861ae03f1cc2296e8adf34ba038 (patch) | |
| tree | 9bc06c7eeb6fca92e8cdd273908f7350260a8cb8 /src/app | |
| parent | 359ea5d55a9452d70c20754c2380b1bf1c704c04 (diff) | |
| parent | f7639f458a4b87263e96de70f26554a660148bc3 (diff) | |
Merge remote-tracking branch 'origin/10.0' into qds/dev
bigger conflicts resolved at:
src/plugins/qmldesigner/CMakeLists.txt
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/app/app_version.h.cmakein | 2 | ||||
| -rw-r--r-- | src/app/app_version.h.in | 2 | ||||
| -rw-r--r-- | src/app/main.cpp | 2 | ||||
| -rw-r--r-- | src/app/main_mac.mm | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index cc56d7703e..940ae30a59 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -12,7 +12,7 @@ install( add_qtc_executable(qtcreator DEFINES IDE_LIBRARY_BASENAME=\"${IDE_LIBRARY_BASE_PATH}\" - DEPENDS Aggregation ExtensionSystem Qt5::Core Qt5::Widgets Utils shared_qtsingleapplication app_version + DEPENDS Aggregation ExtensionSystem Qt::Core Qt::Widgets Utils shared_qtsingleapplication app_version SOURCES main.cpp ../tools/qtcreatorcrashhandler/crashhandlersetup.cpp ../tools/qtcreatorcrashhandler/crashhandlersetup.h @@ -66,7 +66,7 @@ if (QTC_STATIC_BUILD) SOURCES "${CMAKE_CURRENT_BINARY_DIR}/plugin_imports.cpp" ) - if (Qt5_VERSION VERSION_GREATER_EQUAL 6.0.0 AND TARGET QmlDesigner) + if (TARGET QmlDesigner) qt6_import_qml_plugins(qtcreator PATH_TO_SCAN "${CMAKE_CURRENT_SOURCE_DIR}/../../share/qtcreator/qmldesigner") endif() diff --git a/src/app/app_version.h.cmakein b/src/app/app_version.h.cmakein index 4f9f9efa97..5b9098f056 100644 --- a/src/app/app_version.h.cmakein +++ b/src/app/app_version.h.cmakein @@ -1,5 +1,5 @@ // Copyright (C) 2018 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once diff --git a/src/app/app_version.h.in b/src/app/app_version.h.in index eb158f796f..605016b376 100644 --- a/src/app/app_version.h.in +++ b/src/app/app_version.h.in @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #pragma once diff --git a/src/app/main.cpp b/src/app/main.cpp index d338c14c01..b0ca009b8c 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "../tools/qtcreatorcrashhandler/crashhandlersetup.h" diff --git a/src/app/main_mac.mm b/src/app/main_mac.mm index 4e8c48e79d..8e1fa5fe25 100644 --- a/src/app/main_mac.mm +++ b/src/app/main_mac.mm @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0 WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include <qglobal.h> |