Merge lib and extension plugin

There is no longer a need for a separate lib and extension plugin
so they have both been merged into a single declarativewidgets
project which produces the qml extension plugin.

This builds in debug and release on Windows, but only runs in release.

Author: 0x6e

.qmake.conf

@@ -1,2 +1,2 @@
-LIB_DESTDIR = $$shadowed($$PWD/libs)
-LIBS += -L$${LIB_DESTDIR}
+PLUGIN_DESTDIR = $$shadowed($$PWD/qml)
+DEFINES += PLUGIN_IMPORT_PATH=\"\\\"$${PLUGIN_DESTDIR}\\\"\"

declarativewidgets.pro

@@ -2,7 +2,8 @@ TEMPLATE = subdirs
 
 CONFIG += ordered
 
-SUBDIRS = lib runner.pro examples \
-    extensionplugin \
+SUBDIRS = declarativewidgets \
+    runner.pro \
+    examples \
     tests \
     ui2dw

lib/abstractdeclarativeobject.cpp declarativewidgets/abstractdeclarativeobject.cpp

@@ -28,11 +28,11 @@
 #ifndef DECLARATIVECONTAINERWIDGETEXTENSION_P_H
 #define DECLARATIVECONTAINERWIDGETEXTENSION_P_H
 
-#include "declarativewidgets_export.h"
+//#include "declarativewidgets_export.h"
 #include "declarativewidgetextension.h"
 
 template <class T>
-class DECLARATIVEWIDGETS_EXPORT DeclarativeContainerWidgetExtension : public DeclarativeWidgetExtension
+class DeclarativeContainerWidgetExtension : public DeclarativeWidgetExtension
 {
   public:
     explicit DeclarativeContainerWidgetExtension(QObject *parent = 0)

lib/abstractdeclarativeobject_p.h declarativewidgets/abstractdeclarativeobject_p.h

@@ -0,0 +1,138 @@
+TEMPLATE = lib
+TARGET = declarativewidgets
+QT += core-private qml widgets quickwidgets
+
+qtHaveModule(webenginewidgets) {
+    QT += webenginewidgets
+}
+
+CONFIG += qt plugin
+
+TARGET = $$qtLibraryTarget($$TARGET)
+uri = QtWidgets
+
+OTHER_FILES = qmldir
+
+DESTDIR = $${PLUGIN_DESTDIR}/QtWidgets
+
+!equals(_PRO_FILE_PWD_, $$DESTDIR) {
+    copy_qmldir.target = $$DESTDIR/qmldir
+    copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
+    copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"
+    QMAKE_EXTRA_TARGETS += copy_qmldir
+    PRE_TARGETDEPS += $$copy_qmldir.target
+}
+
+qmldir.files = qmldir
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
+qmldir.path = $$installPath
+target.path = $$installPath
+INSTALLS += target qmldir
+
+DEFINES += BUILDING_DECLARATIVEWIDGETS
+CONFIG += c++11
+
+HEADERS = \
+    abstractdeclarativeobject_p.h \
+    declarativeaction_p.h \
+    declarativeactionitem_p.h \
+    declarativeboxlayout_p.h \
+    declarativebuttongroupextension_p.h \
+    declarativecolordialog_p.h \
+    declarativecomboboxextension_p.h \
+    declarativecontainerwidgetextension_p.h \
+    declarativefiledialog_p.h \
+    declarativefilesystemmodelextension_p.h \
+    declarativefontdialog_p.h \
+    declarativeformlayout_p.h \
+    declarativegridlayout_p.h \
+    declarativehboxlayout_p.h \
+    declarativeicon_p.h \
+    declarativeinputdialog_p.h \
+    declarativeitemviewextension_p.h \
+    declarativelabelextension_p.h \
+    declarativelayoutextension.h \
+    declarativeline_p.h \
+    declarativeloaderwidget_p.h \
+    declarativemessagebox_p.h \
+    declarativeobjectextension.h \
+    declarativeobjectproxy_p.h \
+    declarativepixmap_p.h \
+    declarativeqmlcontext_p.h \
+    declarativequickwidgetextension_p.h \
+    declarativeseparator_p.h \
+    declarativespaceritem_p.h \
+    declarativestackedlayout_p.h \
+    declarativestatusbar_p.h \
+    declarativestringlistmodelextension_p.h \
+    declarativetableviewextension_p.h \
+    declarativetabstops_p.h \
+    declarativetabwidget_p.h \
+    declarativetexteditextension_p.h \
+    declarativetreeviewextension_p.h \
+    declarativevboxlayout_p.h \
+    declarativewidgetextension.h \
+    declarativewidgets_plugin.h \
+    defaultobjectcontainer_p.h \
+    defaultwidgetcontainer.h \
+    layoutcontainerinterface_p.h \
+    mainwindowwidgetcontainer_p.h \
+    menubarwidgetcontainer_p.h \
+    menuwidgetcontainer_p.h \
+    objectadaptors_p.h \
+    objectcontainerinterface_p.h \
+    scrollareawidgetcontainer_p.h \
+    stackedwidgetwidgetcontainer_p.h \
+    staticdialogmethodattached_p.h \
+    toolbarwidgetcontainer_p.h \
+    widgetcontainerinterface_p.h
+
+SOURCES = \
+    abstractdeclarativeobject.cpp \
+    declarativeaction.cpp \
+    declarativeactionitem.cpp \
+    declarativeboxlayout.cpp \
+    declarativebuttongroupextension.cpp \
+    declarativecolordialog.cpp \
+    declarativecomboboxextension.cpp \
+    declarativefiledialog.cpp \
+    declarativefilesystemmodelextension.cpp \
+    declarativefontdialog.cpp \
+    declarativeformlayout.cpp \
+    declarativegridlayout.cpp \
+    declarativehboxlayout.cpp \
+    declarativeicon.cpp \
+    declarativeinputdialog.cpp \
+    declarativeitemviewextension.cpp \
+    declarativelabelextension.cpp \
+    declarativelayoutextension.cpp \
+    declarativeline.cpp \
+    declarativeloaderwidget.cpp \
+    declarativemessagebox.cpp \
+    declarativeobjectextension.cpp \
+    declarativepixmap.cpp \
+    declarativeqmlcontext.cpp \
+    declarativequickwidgetextension.cpp \
+    declarativeseparator.cpp \
+    declarativespaceritem.cpp \
+    declarativestackedlayout.cpp \
+    declarativestatusbar.cpp \
+    declarativestringlistmodelextension.cpp \
+    declarativetableviewextension.cpp \
+    declarativetabstops.cpp \
+    declarativetabwidget.cpp \
+    declarativetexteditextension.cpp \
+    declarativetreeviewextension.cpp \
+    declarativevboxlayout.cpp \
+    declarativewidgetextension.cpp \
+    declarativewidgets_plugin.cpp \
+    defaultobjectcontainer.cpp \
+    defaultwidgetcontainer.cpp \
+    mainwindowwidgetcontainer.cpp \
+    menubarwidgetcontainer.cpp \
+    menuwidgetcontainer.cpp \
+    objectadaptors.cpp \
+    scrollareawidgetcontainer.cpp \
+    stackedwidgetwidgetcontainer.cpp \
+    staticdialogmethodattached.cpp \
+    toolbarwidgetcontainer.cpp

lib/declarativeaction.cpp declarativewidgets/declarativeaction.cpp

@@ -1,5 +1,5 @@
 /*
-  extensionplugin_plugin.cpp
+  declarativewidgets_plugin.cpp
 
   This file is part of DeclarativeWidgets, library and tools for creating QtWidget UIs with QML.
 
@@ -26,7 +26,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "extensionplugin_plugin.h"
+#include "declarativewidgets_plugin.h"
 
 #include "declarativeactionitem_p.h"
 #include "declarativeaction_p.h"
@@ -111,6 +111,7 @@ void ExtensionpluginPlugin::registerTypes(const char *uri)
 {
   Q_ASSERT(uri == QLatin1String("QtWidgets"));
 
+
   // uncreatable core
   qmlRegisterType<QAbstractItemModel>();
   qmlRegisterType<QItemSelectionModel>();

lib/declarativeaction_p.h declarativewidgets/declarativeaction_p.h

@@ -1,5 +1,5 @@
 /*
-  extensionplugin_plugin.h
+  declarativewidgets_plugin.h
 
   This file is part of DeclarativeWidgets, library and tools for creating QtWidget UIs with QML.
 

lib/declarativeactionitem.cpp declarativewidgets/declarativeactionitem.cpp

@@ -0,0 +1,2 @@
+module QtWidgets
+plugin declarativewidgets

lib/declarativeactionitem_p.h declarativewidgets/declarativeactionitem_p.h

@@ -24,14 +24,7 @@ RESOURCES += \
     bookstore.qrc
 
 mac {
-    APP_LIBS.files = $${LIB_DESTDIR}/libdeclarativewidgets.1.0.0.dylib
-    APP_LIBS.files += $${LIB_DESTDIR}/libdeclarativewidgets.1.0.dylib
-    APP_LIBS.files += $${LIB_DESTDIR}/libdeclarativewidgets.1.dylib
-    APP_LIBS.files += $${LIB_DESTDIR}/libdeclarativewidgets.dylib
-    APP_LIBS.path = Contents/Frameworks
-    QMAKE_BUNDLE_DATA += APP_LIBS
-
-    DECLARATIVE_WIDGETS.files = $${OUT_PWD}/../../qml/QtWidgets
-    DECLARATIVE_WIDGETS.path = Contents/PlugIns
-    QMAKE_BUNDLE_DATA += DECLARATIVE_WIDGETS
+    QT_WIDGETS.files = $${PLUGIN_DESTDIR}
+    QT_WIDGETS.path = Contents/PlugIns
+    QMAKE_BUNDLE_DATA += QT_WIDGETS
 }

lib/declarativeboxlayout.cpp declarativewidgets/declarativeboxlayout.cpp

@@ -43,6 +43,8 @@ static QWidget *createDeclarativeWidgetsUi(BookStore *bookStore, const QString &
   QQmlEngine engine;
 #ifdef Q_OS_MACOS
   engine.addImportPath(QStringLiteral("%1/../PlugIns").arg(QCoreApplication::applicationDirPath()));
+#else
+  engine.addImportPath(PLUGIN_IMPORT_PATH);
 #endif
   engine.rootContext()->setContextProperty("_store", bookStore);
   QObject::connect(&engine, &QQmlEngine::quit, QCoreApplication::instance(), &QCoreApplication::quit);

lib/declarativeboxlayout_p.h declarativewidgets/declarativeboxlayout_p.h

@@ -19,14 +19,7 @@ HEADERS += \
     settingsadaptor.h
 
 mac {
-    APP_LIBS.files = $${LIB_DESTDIR}/libdeclarativewidgets.1.0.0.dylib
-    APP_LIBS.files += $${LIB_DESTDIR}/libdeclarativewidgets.1.0.dylib
-    APP_LIBS.files += $${LIB_DESTDIR}/libdeclarativewidgets.1.dylib
-    APP_LIBS.files += $${LIB_DESTDIR}/libdeclarativewidgets.dylib
-    APP_LIBS.path = Contents/Frameworks
-    QMAKE_BUNDLE_DATA += APP_LIBS
-
-    DECLARATIVE_WIDGETS.files = $${OUT_PWD}/../../qml/QtWidgets
-    DECLARATIVE_WIDGETS.path = Contents/PlugIns
-    QMAKE_BUNDLE_DATA += DECLARATIVE_WIDGETS
+    QT_WIDGETS.files = $${PLUGIN_DESTDIR}
+    QT_WIDGETS.path = Contents/PlugIns
+    QMAKE_BUNDLE_DATA += QT_WIDGETS
 }

lib/declarativebuttongroupextension.cpp declarativewidgets/declarativebuttongroupextension.cpp

@@ -40,6 +40,8 @@ int main(int argc, char *argv[])
   QQmlEngine engine;
 #ifdef Q_OS_MACOS
   engine.addImportPath(QStringLiteral("%1/../PlugIns").arg(QCoreApplication::applicationDirPath()));
+#else
+  engine.addImportPath(PLUGIN_IMPORT_PATH);
 #endif
   ConfigEditor editor;
   engine.rootContext()->setContextProperty("_editor", &editor);

lib/declarativebuttongroupextension_p.h declarativewidgets/declarativebuttongroupextension_p.h

@@ -1,5 +1,4 @@
 TEMPLATE = app
 DEPENDPATH += .
-INCLUDEPATH += . $$PWD/../lib
+INCLUDEPATH += .
 QT += qml widgets
-LIBS += -ldeclarativewidgets

lib/declarativecolordialog.cpp declarativewidgets/declarativecolordialog.cpp

@@ -43,6 +43,8 @@ int main(int argc, char **argv)
   QQmlEngine engine;
 #ifdef Q_OS_MACOS
   engine.addImportPath(QStringLiteral("%1/../PlugIns").arg(QCoreApplication::applicationDirPath()));
+#else
+  engine.addImportPath(PLUGIN_IMPORT_PATH);
 #endif
   Editor editor;
   engine.rootContext()->setContextProperty("_editor", &editor);

lib/declarativecolordialog_p.h declarativewidgets/declarativecolordialog_p.h

@@ -15,14 +15,7 @@ OTHER_FILES += \
     main.qml
 
 mac {
-    APP_LIBS.files = $${LIB_DESTDIR}/libdeclarativewidgets.1.0.0.dylib
-    APP_LIBS.files += $${LIB_DESTDIR}/libdeclarativewidgets.1.0.dylib
-    APP_LIBS.files += $${LIB_DESTDIR}/libdeclarativewidgets.1.dylib
-    APP_LIBS.files += $${LIB_DESTDIR}/libdeclarativewidgets.dylib
-    APP_LIBS.path = Contents/Frameworks
-    QMAKE_BUNDLE_DATA += APP_LIBS
-
-    DECLARATIVE_WIDGETS.files = $${OUT_PWD}/../../qml/QtWidgets
-    DECLARATIVE_WIDGETS.path = Contents/PlugIns
-    QMAKE_BUNDLE_DATA += DECLARATIVE_WIDGETS
+    QT_WIDGETS.files = $${PLUGIN_DESTDIR}
+    QT_WIDGETS.path = Contents/PlugIns
+    QMAKE_BUNDLE_DATA += QT_WIDGETS
 }