Extras: merge C++ lib to the QML plugin

Change-Id: Idbbe9e0cf1b5b34027035a417fade7b0091da8c5
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

26 files changed, 25 insertions, 111 deletions

diff --git a/src/extras/extras.pro b/src/extras/extras.pro
deleted file mode 100644
index 49a82277..00000000
--- a/src/extras/extras.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-TARGET = QtQuickExtras
-MODULE = quickextras2
-CONFIG += internal_module
-
-QT += quick
-QT += core-private gui-private qml-private quick-private quickcontrols2-private
-
-DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
-
-QMAKE_DOCS = $$PWD/doc/qtquickextras2.qdocconf
-
-HEADERS += \
-    $$PWD/qtquickextrasglobal_p.h
-
-include(extras.pri)
-load(qt_module)
diff --git a/src/extras/qtquickextrasglobal_p.h b/src/extras/qtquickextrasglobal_p.h
deleted file mode 100644
index 1c9e54eb..00000000
--- a/src/extras/qtquickextrasglobal_p.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Quick Extras module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTQUICKEXTRASGLOBAL_P_H
-#define QTQUICKEXTRASGLOBAL_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-#ifndef QT_STATIC
-#  if defined(QT_BUILD_QUICKEXTRAS2_LIB)
-#    define Q_QUICKEXTRAS_EXPORT Q_DECL_EXPORT
-#  else
-#    define Q_QUICKEXTRAS_EXPORT Q_DECL_IMPORT
-#  endif
-#else
-#  define Q_QUICKEXTRAS_EXPORT
-#endif
-
-QT_END_NAMESPACE
-
-#endif // QTQUICKEXTRASGLOBAL_P_H
diff --git a/src/extras/doc/images/.directory b/src/imports/extras/doc/images/.directory
index 7d49c166..7d49c166 100644
--- a/src/extras/doc/images/.directory
+++ b/src/imports/extras/doc/images/.directory
diff --git a/src/extras/doc/images/qtquickextras2-dial-background.png b/src/imports/extras/doc/images/qtquickextras2-dial-background.png
index 38fad583..38fad583 100644
--- a/src/extras/doc/images/qtquickextras2-dial-background.png
+++ b/src/imports/extras/doc/images/qtquickextras2-dial-background.png
diff --git a/src/extras/doc/images/qtquickextras2-dial-handle.png b/src/imports/extras/doc/images/qtquickextras2-dial-handle.png
index e6fd8cdc..e6fd8cdc 100644
--- a/src/extras/doc/images/qtquickextras2-dial-handle.png
+++ b/src/imports/extras/doc/images/qtquickextras2-dial-handle.png
diff --git a/src/extras/doc/images/qtquickextras2-tumbler-background.png b/src/imports/extras/doc/images/qtquickextras2-tumbler-background.png
index aa736615..aa736615 100644
--- a/src/extras/doc/images/qtquickextras2-tumbler-background.png
+++ b/src/imports/extras/doc/images/qtquickextras2-tumbler-background.png
diff --git a/src/extras/doc/images/qtquickextras2-tumbler-contentItem.png b/src/imports/extras/doc/images/qtquickextras2-tumbler-contentItem.png
index aa736615..aa736615 100644
--- a/src/extras/doc/images/qtquickextras2-tumbler-contentItem.png
+++ b/src/imports/extras/doc/images/qtquickextras2-tumbler-contentItem.png
diff --git a/src/extras/doc/images/qtquickextras2-tumbler-delegate.png b/src/imports/extras/doc/images/qtquickextras2-tumbler-delegate.png
index 77c51efd..77c51efd 100644
--- a/src/extras/doc/images/qtquickextras2-tumbler-delegate.png
+++ b/src/imports/extras/doc/images/qtquickextras2-tumbler-delegate.png
diff --git a/src/extras/doc/images/qtquickextras2-tumbler-wrap.gif b/src/imports/extras/doc/images/qtquickextras2-tumbler-wrap.gif
index 2a7e435d..2a7e435d 100644
--- a/src/extras/doc/images/qtquickextras2-tumbler-wrap.gif
+++ b/src/imports/extras/doc/images/qtquickextras2-tumbler-wrap.gif
diff --git a/src/extras/doc/qtquickextras2.qdocconf b/src/imports/extras/doc/qtquickextras2.qdocconf
index 2faa6b26..622c7d05 100644
--- a/src/extras/doc/qtquickextras2.qdocconf
+++ b/src/imports/extras/doc/qtquickextras2.qdocconf
@@ -28,8 +28,7 @@ depends = qtcore qtgui qtdoc qtqml qtquick qtquicklayouts qtquickdialogs qtquick
 # Specify the install path under QT_INSTALL_EXAMPLES
 # Examples will be installed under quick/extras - 'extras' subdirectory
 # is given as part of \example commands
-exampledirs += ../../../examples/quick/extras \
-               ../../imports/extras
+exampledirs += ../ ../../../../examples/quick/extras
 examplesinstallpath = quick/extras
 
 headerdirs += ../
diff --git a/src/extras/doc/src/qtquickextras2-customize.qdoc b/src/imports/extras/doc/src/qtquickextras2-customize.qdoc
index fc04fe1f..fc04fe1f 100644
--- a/src/extras/doc/src/qtquickextras2-customize.qdoc
+++ b/src/imports/extras/doc/src/qtquickextras2-customize.qdoc
diff --git a/src/extras/doc/src/qtquickextras2-index.qdoc b/src/imports/extras/doc/src/qtquickextras2-index.qdoc
index 53712e22..53712e22 100644
--- a/src/extras/doc/src/qtquickextras2-index.qdoc
+++ b/src/imports/extras/doc/src/qtquickextras2-index.qdoc
diff --git a/src/extras/doc/src/qtquickextras2-overview.qdoc b/src/imports/extras/doc/src/qtquickextras2-overview.qdoc
index 9776e1de..9776e1de 100644
--- a/src/extras/doc/src/qtquickextras2-overview.qdoc
+++ b/src/imports/extras/doc/src/qtquickextras2-overview.qdoc
diff --git a/src/extras/doc/src/qtquickextras2.qdoc b/src/imports/extras/doc/src/qtquickextras2.qdoc
index 74dbd778..74dbd778 100644
--- a/src/extras/doc/src/qtquickextras2.qdoc
+++ b/src/imports/extras/doc/src/qtquickextras2.qdoc
diff --git a/src/extras/extras.pri b/src/imports/extras/extras.pri
index 684fd6e5..859ed07e 100644
--- a/src/extras/extras.pri
+++ b/src/imports/extras/extras.pri
@@ -1,4 +1,8 @@
-INCLUDEPATH += $$PWD
+QML_FILES = \
+    Dial.qml \
+    Drawer.qml \
+    SwipeView.qml \
+    Tumbler.qml
 
 HEADERS += \
     $$PWD/qquickdial_p.h \
diff --git a/src/imports/extras/extras.pro b/src/imports/extras/extras.pro
index 5aa6f04e..1046cec4 100644
--- a/src/imports/extras/extras.pro
+++ b/src/imports/extras/extras.pro
@@ -3,21 +3,21 @@ TARGETPATH = QtQuick/Extras.2
 IMPORT_VERSION = 2.0
 
 QT += qml quick
-QT += core-private gui-private qml-private quick-private quickcontrols2-private quickextras2-private
+QT += core-private gui-private qml-private quick-private quickcontrols2-private
+
+QMAKE_DOCS = $$PWD/doc/qtquickextras2.qdocconf
+
+DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+
+INCLUDEPATH += $$PWD
 
 OTHER_FILES += \
     qmldir
 
-QML_FILES = \
-    Dial.qml \
-    Drawer.qml \
-    SwipeView.qml \
-    Tumbler.qml
-
 SOURCES += \
     $$PWD/qtquickextras2plugin.cpp
 
+include(extras.pri)
+
 CONFIG += no_cxx_module
 load(qml_plugin)
-
-DISTFILES +=
diff --git a/src/extras/qquickdial.cpp b/src/imports/extras/qquickdial.cpp
index fe196659..fe196659 100644
--- a/src/extras/qquickdial.cpp
+++ b/src/imports/extras/qquickdial.cpp
diff --git a/src/extras/qquickdial_p.h b/src/imports/extras/qquickdial_p.h
index 3d14ea4e..6e3f4e6a 100644
--- a/src/extras/qquickdial_p.h
+++ b/src/imports/extras/qquickdial_p.h
@@ -51,14 +51,13 @@
 #include <QtCore/qvariant.h>
 #include <QtQml/qqmlcomponent.h>
 #include <QtQuickControls/private/qquickcontrol_p.h>
-#include <QtQuickExtras/private/qtquickextrasglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickDialAttached;
 class QQuickDialPrivate;
 
-class Q_QUICKEXTRAS_EXPORT QQuickDial : public QQuickControl
+class QQuickDial : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL)
diff --git a/src/extras/qquickdrawer.cpp b/src/imports/extras/qquickdrawer.cpp
index 7c61688a..7c61688a 100644
--- a/src/extras/qquickdrawer.cpp
+++ b/src/imports/extras/qquickdrawer.cpp
diff --git a/src/extras/qquickdrawer_p.h b/src/imports/extras/qquickdrawer_p.h
index 59b76a10..2a45f5b1 100644
--- a/src/extras/qquickdrawer_p.h
+++ b/src/imports/extras/qquickdrawer_p.h
@@ -48,7 +48,6 @@
 // We mean it.
 //
 
-#include <QtQuickExtras/private/qtquickextrasglobal_p.h>
 #include <QtQuickControls/private/qquickcontrol_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -56,7 +55,7 @@ QT_BEGIN_NAMESPACE
 class QQuickPropertyAnimation;
 class QQuickDrawerPrivate;
 
-class Q_QUICKEXTRAS_EXPORT QQuickDrawer : public QQuickControl
+class QQuickDrawer : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(Qt::Edge edge READ edge WRITE setEdge NOTIFY edgeChanged FINAL)
diff --git a/src/extras/qquickswipeview.cpp b/src/imports/extras/qquickswipeview.cpp
index c359a983..c359a983 100644
--- a/src/extras/qquickswipeview.cpp
+++ b/src/imports/extras/qquickswipeview.cpp
diff --git a/src/extras/qquickswipeview_p.h b/src/imports/extras/qquickswipeview_p.h
index c314204e..718eccea 100644
--- a/src/extras/qquickswipeview_p.h
+++ b/src/imports/extras/qquickswipeview_p.h
@@ -48,14 +48,13 @@
 // We mean it.
 //
 
-#include <QtQuickExtras/private/qtquickextrasglobal_p.h>
 #include <QtQuickControls/private/qquickcontainer_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickSwipeViewPrivate;
 
-class Q_QUICKEXTRAS_EXPORT QQuickSwipeView : public QQuickContainer
+class QQuickSwipeView : public QQuickContainer
 {
     Q_OBJECT
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged FINAL)
diff --git a/src/extras/qquicktumbler.cpp b/src/imports/extras/qquicktumbler.cpp
index 53a8af8f..53a8af8f 100644
--- a/src/extras/qquicktumbler.cpp
+++ b/src/imports/extras/qquicktumbler.cpp
diff --git a/src/extras/qquicktumbler_p.h b/src/imports/extras/qquicktumbler_p.h
index ecefad18..bda2a020 100644
--- a/src/extras/qquicktumbler_p.h
+++ b/src/imports/extras/qquicktumbler_p.h
@@ -51,14 +51,13 @@
 #include <QtCore/qvariant.h>
 #include <QtQml/qqmlcomponent.h>
 #include <QtQuickControls/private/qquickcontrol_p.h>
-#include <QtQuickExtras/private/qtquickextrasglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QQuickTumblerAttached;
 class QQuickTumblerPrivate;
 
-class Q_QUICKEXTRAS_EXPORT QQuickTumbler : public QQuickControl
+class QQuickTumbler : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged FINAL)
@@ -115,7 +114,7 @@ Q_DECLARE_TYPEINFO(QQuickTumbler, Q_COMPLEX_TYPE);
 
 class QQuickTumblerAttachedPrivate;
 
-class Q_QUICKEXTRAS_EXPORT QQuickTumblerAttached : public QObject
+class QQuickTumblerAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickTumbler *tumbler READ tumbler CONSTANT)
diff --git a/src/imports/extras/qtquickextras2plugin.cpp b/src/imports/extras/qtquickextras2plugin.cpp
index a17ae159..8b1ebb50 100644
--- a/src/imports/extras/qtquickextras2plugin.cpp
+++ b/src/imports/extras/qtquickextras2plugin.cpp
@@ -36,10 +36,10 @@
 
 #include <QtQml/qqmlextensionplugin.h>
 
-#include <QtQuickExtras/private/qquickdial_p.h>
-#include <QtQuickExtras/private/qquickdrawer_p.h>
-#include <QtQuickExtras/private/qquickswipeview_p.h>
-#include <QtQuickExtras/private/qquicktumbler_p.h>
+#include "qquickdial_p.h"
+#include "qquickdrawer_p.h"
+#include "qquickswipeview_p.h"
+#include "qquicktumbler_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/src.pro b/src/src.pro
index cc6f0111..ff2ae30b 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,8 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS += \
     controls \
-    extras \
     imports
 
-extras.depends = controls
-imports.depends = controls extras
+imports.depends = controls