From 5246dd2de211ffb81313a5c29ae7894545a28c43 Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Fri, 27 Mar 2020 11:17:35 +0100
Subject: Register C++ types declaratively

Adapt to the new way of registering C++ types. The types need to be
seen at compile time so that code can be generated that invokes them.

This patch:

- Adds QML_* macros where applicable.
- Adapts the build system files to the new way of registering modules.
- Splits up the QtQuick.Controls[.*].impl files into their own plugins,
  as we can only register one QML module per .pro file.
- Removes C++ type registration calls in every plugin.
- Moves private types from src/quickcontrols2/quickcontrols2.pro
  to src/quickcontrols2/impl/quickcontrols2-impl.pro. Some of these
  types need to be exposed to QML, but quickcontrols2.pro is already in
  use to declare the QtQuick.Controls import (and also provides the
  public C++ QQuickStyle API), and the new QML_IMPORT_NAME/VERSION
  syntax only allows one module per project. As some of the types that
  need to be exposed to QML are also referenced by some C++ code (e.g.
  tests, etc.), we just move all of the private types to the new
  library.

Follow-up patches will register the QML types declaratively.

Task-number: QTBUG-82922
Change-Id: Iaf9ee106237d61701d57a8896f3822304c8151a6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 tests/auto/qquickiconlabel/qquickiconlabel.pro     | 2 +-
 tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/auto/qquickiconlabel')

diff --git a/tests/auto/qquickiconlabel/qquickiconlabel.pro b/tests/auto/qquickiconlabel/qquickiconlabel.pro
index 6b0f73b3..af0a76cd 100644
--- a/tests/auto/qquickiconlabel/qquickiconlabel.pro
+++ b/tests/auto/qquickiconlabel/qquickiconlabel.pro
@@ -3,7 +3,7 @@ macos:CONFIG -= app_bundle
 TARGET = tst_qquickiconlabel
 
 QT += core gui qml quick testlib
-QT_PRIVATE += quick-private quickcontrols2-private
+QT_PRIVATE += quick-private quickcontrols2impl-private
 
 include (../shared/util.pri)
 
diff --git a/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp b/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp
index 7a1cb259..526ecf05 100644
--- a/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp
+++ b/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp
@@ -35,8 +35,8 @@
 #include <QtQuick/qquickitemgrabresult.h>
 #include <QtQuick/private/qquicktext_p.h>
 #include <QtQuickTemplates2/private/qquickicon_p.h>
-#include <QtQuickControls2/private/qquickiconimage_p.h>
-#include <QtQuickControls2/private/qquickiconlabel_p.h>
+#include <QtQuickControls2Impl/private/qquickiconimage_p.h>
+#include <QtQuickControls2Impl/private/qquickiconlabel_p.h>
 
 #include "../shared/util.h"
 #include "../shared/visualtestutil.h"
-- 
cgit v1.2.3