Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: KDABLabs/DeclarativeWidgets
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9ed50f33f6f29e82cdf3827a0bb5b5b8810e0184
Choose a base ref
..
head repository: KDABLabs/DeclarativeWidgets
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4615f43e974e6bf4e91713d9ace065a892234220
Choose a head ref
Showing with 467 additions and 762 deletions.
  1. +2 −2 .qmake.conf
  2. +3 −2 declarativewidgets.pro
  3. +3 −6 examples/bookstore/bookstore.pro
  4. +13 −9 examples/bookstore/main.cpp
  5. +3 −6 examples/config-editor/config-editor.pro
  6. +12 −7 examples/config-editor/main.cpp
  7. +1 −2 examples/examples.pri
  8. +13 −8 examples/text-editor/main.cpp
  9. +3 −6 examples/text-editor/text-editor.pro
  10. +0 −43 extensionplugin/extensionplugin.pro
  11. +0 −3 extensionplugin/qmldir
  12. +0 −39 lib/declarativewidgets_export.h
  13. +0 −266 lib/declarativewidgetsdocument.cpp
  14. +0 −71 lib/declarativewidgetsdocument.h
  15. +0 −123 lib/lib.pro
  16. +6 −5 main.cpp
  17. +1 −3 runner.pro
  18. 0 {lib → src}/abstractdeclarativeobject.cpp
  19. +2 −2 {lib → src}/abstractdeclarativeobject_p.h
  20. 0 {lib → src}/declarativeaction.cpp
  21. +2 −2 {lib → src}/declarativeaction_p.h
  22. 0 {lib → src}/declarativeactionitem.cpp
  23. +2 −2 {lib → src}/declarativeactionitem_p.h
  24. 0 {lib → src}/declarativeboxlayout.cpp
  25. +2 −2 {lib → src}/declarativeboxlayout_p.h
  26. 0 {lib → src}/declarativebuttongroupextension.cpp
  27. +2 −2 {lib → src}/declarativebuttongroupextension_p.h
  28. 0 {lib → src}/declarativecolordialog.cpp
  29. +3 −3 {lib → src}/declarativecolordialog_p.h
  30. 0 {lib → src}/declarativecomboboxextension.cpp
  31. +2 −2 {lib → src}/declarativecomboboxextension_p.h
  32. +2 −2 {lib → src}/declarativecontainerwidgetextension_p.h
  33. 0 {lib → src}/declarativefiledialog.cpp
  34. +3 −3 {lib → src}/declarativefiledialog_p.h
  35. 0 {lib → src}/declarativefilesystemmodelextension.cpp
  36. +2 −2 {lib → src}/declarativefilesystemmodelextension_p.h
  37. 0 {lib → src}/declarativefontdialog.cpp
  38. +3 −3 {lib → src}/declarativefontdialog_p.h
  39. 0 {lib → src}/declarativeformlayout.cpp
  40. +4 −4 {lib → src}/declarativeformlayout_p.h
  41. 0 {lib → src}/declarativegridlayout.cpp
  42. +4 −4 {lib → src}/declarativegridlayout_p.h
  43. 0 {lib → src}/declarativehboxlayout.cpp
  44. +3 −3 {lib → src}/declarativehboxlayout_p.h
  45. 0 {lib → src}/declarativeicon.cpp
  46. +3 −3 {lib → src}/declarativeicon_p.h
  47. 0 {lib → src}/declarativeinputdialog.cpp
  48. +3 −3 {lib → src}/declarativeinputdialog_p.h
  49. 0 {lib → src}/declarativeitemviewextension.cpp
  50. +3 −3 {lib → src}/declarativeitemviewextension_p.h
  51. 0 {lib → src}/declarativelabelextension.cpp
  52. +2 −2 {lib → src}/declarativelabelextension_p.h
  53. 0 {lib → src}/declarativelayoutextension.cpp
  54. 0 {lib → src}/declarativelayoutextension.h
  55. 0 {lib → src}/declarativeline.cpp
  56. +2 −2 {lib → src}/declarativeline_p.h
  57. 0 {lib → src}/declarativeloaderwidget.cpp
  58. +2 −2 {lib → src}/declarativeloaderwidget_p.h
  59. 0 {lib → src}/declarativemessagebox.cpp
  60. +3 −3 {lib → src}/declarativemessagebox_p.h
  61. 0 {lib → src}/declarativeobjectextension.cpp
  62. +2 −2 {lib → src}/declarativeobjectextension.h
  63. +2 −2 {lib → src}/declarativeobjectproxy_p.h
  64. 0 {lib → src}/declarativepixmap.cpp
  65. +3 −3 {lib → src}/declarativepixmap_p.h
  66. 0 {lib → src}/declarativeqmlcontext.cpp
  67. +2 −2 {lib → src}/declarativeqmlcontext_p.h
  68. 0 {lib → src}/declarativequickwidgetextension.cpp
  69. +2 −2 {lib → src}/declarativequickwidgetextension_p.h
  70. 0 {lib → src}/declarativeseparator.cpp
  71. +2 −2 {lib → src}/declarativeseparator_p.h
  72. 0 {lib → src}/declarativespaceritem.cpp
  73. +2 −2 {lib → src}/declarativespaceritem_p.h
  74. 0 {lib → src}/declarativestackedlayout.cpp
  75. +3 −3 {lib → src}/declarativestackedlayout_p.h
  76. 0 {lib → src}/declarativestatusbar.cpp
  77. +3 −3 {lib → src}/declarativestatusbar_p.h
  78. 0 {lib → src}/declarativestringlistmodelextension.cpp
  79. +2 −2 {lib → src}/declarativestringlistmodelextension_p.h
  80. 0 {lib → src}/declarativetableviewextension.cpp
  81. +2 −2 {lib → src}/declarativetableviewextension_p.h
  82. 0 {lib → src}/declarativetabstops.cpp
  83. +2 −2 {lib → src}/declarativetabstops_p.h
  84. 0 {lib → src}/declarativetabwidget.cpp
  85. +4 −4 {lib → src}/declarativetabwidget_p.h
  86. 0 {lib → src}/declarativetexteditextension.cpp
  87. +2 −2 {lib → src}/declarativetexteditextension_p.h
  88. 0 {lib → src}/declarativetreeviewextension.cpp
  89. +2 −2 {lib → src}/declarativetreeviewextension_p.h
  90. 0 {lib → src}/declarativevboxlayout.cpp
  91. +3 −3 {lib → src}/declarativevboxlayout_p.h
  92. 0 {lib → src}/declarativewidgetextension.cpp
  93. +2 −2 {lib → src}/declarativewidgetextension.h
  94. 0 {extensionplugin → src}/declarativewidgets.typeinfo
  95. +16 −5 extensionplugin/extensionplugin_plugin.cpp → src/declarativewidgets_plugin.cpp
  96. +1 −1 extensionplugin/extensionplugin_plugin.h → src/declarativewidgets_plugin.h
  97. 0 {lib → src}/defaultobjectcontainer.cpp
  98. +2 −2 {lib → src}/defaultobjectcontainer_p.h
  99. 0 {lib → src}/defaultwidgetcontainer.cpp
  100. +2 −2 {lib → src}/defaultwidgetcontainer.h
  101. +2 −2 {lib → src}/layoutcontainerinterface_p.h
  102. 0 {lib → src}/mainwindowwidgetcontainer.cpp
  103. +2 −2 {lib → src}/mainwindowwidgetcontainer_p.h
  104. 0 {lib → src}/menubarwidgetcontainer.cpp
  105. +2 −2 {lib → src}/menubarwidgetcontainer_p.h
  106. 0 {lib → src}/menuwidgetcontainer.cpp
  107. +2 −2 {lib → src}/menuwidgetcontainer_p.h
  108. 0 {lib → src}/objectadaptors.cpp
  109. +5 −5 {lib → src}/objectadaptors_p.h
  110. +2 −2 {lib → src}/objectcontainerinterface_p.h
  111. +2 −0 src/qmldir
  112. 0 {lib → src}/scrollareawidgetcontainer.cpp
  113. +2 −2 {lib → src}/scrollareawidgetcontainer_p.h
  114. +138 −0 src/src.pro
  115. 0 {lib → src}/stackedwidgetwidgetcontainer.cpp
  116. +2 −2 {lib → src}/stackedwidgetwidgetcontainer_p.h
  117. 0 {lib → src}/staticdialogmethodattached.cpp
  118. +2 −2 {lib → src}/staticdialogmethodattached_p.h
  119. 0 {lib → src}/toolbarwidgetcontainer.cpp
  120. +2 −2 {lib → src}/toolbarwidgetcontainer_p.h
  121. +2 −2 {lib → src}/widgetcontainerinterface_p.h
  122. +0 −4 tests/auto/auto.pri
  123. +2 −1 tests/auto/auto.pro
  124. +11 −13 tests/auto/instantiatetypes/tst_instantiatetypes.cpp
  125. +4 −5 tests/auto/layouts/tst_layouts.cpp
  126. +8 −0 tests/auto/qmlplugins/qmlplugins.pro
  127. +80 −0 tests/auto/qmlplugins/tst_qmlplugins.cpp
  128. +22 −9 tests/auto/quickwidget/tst_quickwidget.cpp
4 changes: 2 additions & 2 deletions .qmake.conf
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LIB_DESTDIR = $$shadowed($$PWD/libs)
LIBS += -L$${LIB_DESTDIR}
PLUGIN_DESTDIR = $$shadowed($$PWD/qml)
DEFINES += PLUGIN_IMPORT_PATH=\"\\\"$${PLUGIN_DESTDIR}\\\"\"
5 changes: 3 additions & 2 deletions declarativewidgets.pro
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,8 @@ TEMPLATE = subdirs

CONFIG += ordered

SUBDIRS = lib runner.pro examples \
extensionplugin \
SUBDIRS = src \
runner.pro \
examples \
tests \
ui2dw
9 changes: 3 additions & 6 deletions examples/bookstore/bookstore.pro
View file
Original file line number Diff line number Diff line change
@@ -24,10 +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
QT_WIDGETS.files = $${PLUGIN_DESTDIR}
QT_WIDGETS.path = Contents/PlugIns
QMAKE_BUNDLE_DATA += QT_WIDGETS
}
22 changes: 13 additions & 9 deletions examples/bookstore/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -28,10 +28,9 @@

#include "bookstore.h"

#include "declarativewidgetsdocument.h"

#include <QApplication>
#include <QDebug>
#include <QQmlComponent>
#include <QQmlContext>
#include <QQmlEngine>
#include <QQuickWidget>
@@ -41,14 +40,19 @@ static QWidget *createDeclarativeWidgetsUi(BookStore *bookStore, const QString &
{
const QUrl documentUrl = QUrl(QString("qrc:///widgets/%1").arg(fileName));

DeclarativeWidgetsDocument *document = new DeclarativeWidgetsDocument(documentUrl, bookStore);
QObject::connect(document->engine(), SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));

document->setContextProperty("_store", bookStore);

QWidget *widget = document->create<QWidget>();
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);

QQmlComponent component(&engine, documentUrl, bookStore);
QWidget *widget = qobject_cast<QWidget*>(component.create());
if (!widget)
qFatal("Failed to create widget from document");
qFatal("Failed to create widget from QML");

return widget;
}
9 changes: 3 additions & 6 deletions examples/config-editor/config-editor.pro
View file
Original file line number Diff line number Diff line change
@@ -19,10 +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
QT_WIDGETS.files = $${PLUGIN_DESTDIR}
QT_WIDGETS.path = Contents/PlugIns
QMAKE_BUNDLE_DATA += QT_WIDGETS
}
19 changes: 12 additions & 7 deletions examples/config-editor/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -27,23 +27,28 @@

#include "configeditor.h"

#include "declarativewidgetsdocument.h"

#include <QApplication>
#include <QQmlComponent>
#include <QQmlContext>
#include <QQmlEngine>
#include <QWidget>

int main(int argc, char *argv[])
{
QApplication app(argc, argv);

DeclarativeWidgetsDocument document(QUrl("qrc:///main.qml"));
QObject::connect(document.engine(), SIGNAL(quit()), &app, SLOT(quit()));

QQmlEngine engine;
#ifdef Q_OS_MACOS
engine.addImportPath(QStringLiteral("%1/../PlugIns").arg(QCoreApplication::applicationDirPath()));
#else
engine.addImportPath(PLUGIN_IMPORT_PATH);
#endif
ConfigEditor editor;
document.setContextProperty("_editor", &editor);
engine.rootContext()->setContextProperty("_editor", &editor);
QObject::connect(&engine, &QQmlEngine::quit, QCoreApplication::instance(), &QCoreApplication::quit);

QWidget *widget = document.create<QWidget>();
QQmlComponent component(&engine, QStringLiteral("qrc:///main.qml"));
QWidget *widget = qobject_cast<QWidget*>(component.create());
if (!widget)
qFatal("Failed to create widget from document");

3 changes: 1 addition & 2 deletions examples/examples.pri
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
TEMPLATE = app
DEPENDPATH += .
INCLUDEPATH += . $$PWD/../lib
INCLUDEPATH += .
QT += qml widgets
LIBS += -ldeclarativewidgets
21 changes: 13 additions & 8 deletions examples/text-editor/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -27,10 +27,10 @@

#include "editor.h"

#include "declarativewidgetsdocument.h"

#include <QApplication>
#include <QDebug>
#include <QQmlComponent>
#include <QQmlContext>
#include <QQmlEngine>
#include <QWidget>

@@ -40,15 +40,20 @@ int main(int argc, char **argv)

const QUrl documentUrl = QUrl("qrc:///main.qml");

DeclarativeWidgetsDocument document(documentUrl);
QObject::connect(document.engine(), SIGNAL(quit()), &app, SLOT(quit()));

QQmlEngine engine;
#ifdef Q_OS_MACOS
engine.addImportPath(QStringLiteral("%1/../PlugIns").arg(QCoreApplication::applicationDirPath()));
#else
engine.addImportPath(PLUGIN_IMPORT_PATH);
#endif
Editor editor;
document.setContextProperty("_editor", &editor);
engine.rootContext()->setContextProperty("_editor", &editor);
QObject::connect(&engine, &QQmlEngine::quit, QCoreApplication::instance(), &QCoreApplication::quit);

QWidget *widget = document.create<QWidget>();
QQmlComponent component(&engine, documentUrl);
QWidget *widget = qobject_cast<QWidget*>(component.create());
if (!widget)
qFatal("Failed to create widget from document");
qFatal("Failed to create widget from QML");

widget->show();

9 changes: 3 additions & 6 deletions examples/text-editor/text-editor.pro
View file
Original file line number Diff line number Diff line change
@@ -15,10 +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
QT_WIDGETS.files = $${PLUGIN_DESTDIR}
QT_WIDGETS.path = Contents/PlugIns
QMAKE_BUNDLE_DATA += QT_WIDGETS
}
43 changes: 0 additions & 43 deletions extensionplugin/extensionplugin.pro
View file

This file was deleted.

3 changes: 0 additions & 3 deletions extensionplugin/qmldir
View file

This file was deleted.

39 changes: 0 additions & 39 deletions lib/declarativewidgets_export.h
View file

This file was deleted.

Loading