From 4bd87b903b355b53e3105ba1ae7c154c4e55cdaf Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 18 Nov 2022 15:15:16 +0800 Subject: Remove "2" from Qt Quick Controls directories Qt Quick Controls 2 was named that way because it was a follow-up to Qt Quick Controls 1.x. Now that Qt Quick Controls 1 is no longer supported, we don't need to have "2" in the name. Work on this was already started for the documentation in 1abdfe5d5a052f2298b7bf657513dfa7e0c66a56. By doing this renaming a few weeks before feature freeze, it won't affect the release but still results in as little time possible spent manually fixing conflicts in cherry-picks from non-LTS releases as a result of the renaming. This patch does the following: - Renames directories. - Adapts CMakeLists.txt and other files to account for the new paths. A follow-up patch will handle documentation. It does not touch library names or other user-facing stuff, as that will have to be done in Qt 7. Task-number: QTBUG-95413 Change-Id: I170d8db19033ee71e495ff0c5c1a517a41ed7634 Reviewed-by: Mitch Curtis --- .../quickdialogsquickimpl/qtquickdialogs2quickimplforeign.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/quickdialogs/quickdialogsquickimpl/qtquickdialogs2quickimplforeign.cpp (limited to 'src/quickdialogs/quickdialogsquickimpl/qtquickdialogs2quickimplforeign.cpp') diff --git a/src/quickdialogs/quickdialogsquickimpl/qtquickdialogs2quickimplforeign.cpp b/src/quickdialogs/quickdialogsquickimpl/qtquickdialogs2quickimplforeign.cpp new file mode 100644 index 0000000000..6a05b15c27 --- /dev/null +++ b/src/quickdialogs/quickdialogsquickimpl/qtquickdialogs2quickimplforeign.cpp @@ -0,0 +1,10 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#include "qtquickdialogs2quickimplforeign_p.h" + +QT_BEGIN_NAMESPACE + +QT_END_NAMESPACE + +#include "moc_qtquickdialogs2quickimplforeign_p.cpp" -- cgit v1.2.3