diff --git a/examples/minimalqmake/src/Page1.qml b/examples/minimalqmake/Page1.qml similarity index 100% copy from examples/minimalqmake/src/Page1.qml copy to examples/minimalqmake/Page1.qml diff --git a/examples/minimalqmake/src/Page1Form.ui.qml b/examples/minimalqmake/Page1Form.ui.qml similarity index 100% copy from examples/minimalqmake/src/Page1Form.ui.qml copy to examples/minimalqmake/Page1Form.ui.qml diff --git a/examples/minimalqmake/src/kirigami-icons.qrc b/examples/minimalqmake/kirigami-icons.qrc similarity index 100% copy from examples/minimalqmake/src/kirigami-icons.qrc copy to examples/minimalqmake/kirigami-icons.qrc diff --git a/examples/minimalqmake/src/main.cpp b/examples/minimalqmake/main.cpp similarity index 88% copy from examples/minimalqmake/src/main.cpp copy to examples/minimalqmake/main.cpp index b8d79cf2..887d4ced 100644 --- a/examples/minimalqmake/src/main.cpp +++ b/examples/minimalqmake/main.cpp @@ -1,40 +1,42 @@ /* * Copyright 2017 Marco Martin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as * published by the Free Software Foundation; either version 2 or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Library General Public License for more details * * You should have received a copy of the GNU Library General Public * License along with this program; if not, write to the * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include #include - - -#include - -Q_IMPORT_PLUGIN(KirigamiPlugin) +#ifdef Q_OS_ANDROID +#include "./3rdparty/kirigami/src/kirigamiplugin.h" +#endif int main(int argc, char *argv[]) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); QQmlApplicationEngine engine; +#ifdef Q_OS_ANDROID + KirigamiPlugin::getInstance().registerTypes(); +#endif + engine.load(QUrl(QLatin1String("qrc:/main.qml"))); if (engine.rootObjects().isEmpty()) return -1; return app.exec(); } diff --git a/examples/minimalqmake/src/main.qml b/examples/minimalqmake/main.qml similarity index 100% copy from examples/minimalqmake/src/main.qml copy to examples/minimalqmake/main.qml diff --git a/examples/minimalqmake/minimalqmake.pro b/examples/minimalqmake/minimalqmake.pro index fe95bd2c..fdd0e182 100644 --- a/examples/minimalqmake/minimalqmake.pro +++ b/examples/minimalqmake/minimalqmake.pro @@ -1,10 +1,35 @@ -TEMPLATE = subdirs +TEMPLATE = app -SUBDIRS = \ - kirigami \ - src +QT += qml quick -src.subdir = src -kirigami.subdir = 3rdparty/kirigami +android: { + include(3rdparty/kirigami/kirigami.pri) +} -src.depends = kirigami +CONFIG += c++11 + +SOURCES += main.cpp + +RESOURCES += qml.qrc + +# Additional import path used to resolve QML modules in Qt Creator's code model +QML_IMPORT_PATH = + +# Additional import path used to resolve QML modules just for Qt Quick Designer +QML_DESIGNER_IMPORT_PATH = + +# The following define makes your compiler emit warnings if you use +# any feature of Qt which as been marked deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if you use deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +# Default rules for deployment. +qnx: target.path = /tmp/$${TARGET}/bin +else: unix:!android: target.path = /opt/$${TARGET}/bin +!isEmpty(target.path): INSTALLS += target diff --git a/examples/minimalqmake/src/qml.qrc b/examples/minimalqmake/qml.qrc similarity index 100% copy from examples/minimalqmake/src/qml.qrc copy to examples/minimalqmake/qml.qrc diff --git a/examples/minimalqmake/src/qtquickcontrols2.conf b/examples/minimalqmake/qtquickcontrols2.conf similarity index 100% copy from examples/minimalqmake/src/qtquickcontrols2.conf copy to examples/minimalqmake/qtquickcontrols2.conf diff --git a/examples/qmakewithstaticplugin/3rdparty/README b/examples/qmakewithstaticplugin/3rdparty/README new file mode 100644 index 00000000..aad19dd4 --- /dev/null +++ b/examples/qmakewithstaticplugin/3rdparty/README @@ -0,0 +1,6 @@ +Add here, with either a script that does a git checkout +or as git submodules the two projects: + +git://anongit.kde.org/kirigami.git +git://anongit.kde.org/breeze-icons.git + diff --git a/examples/minimalqmake/minimalqmake.pro b/examples/qmakewithstaticplugin/minimalqmake.pro similarity index 100% copy from examples/minimalqmake/minimalqmake.pro copy to examples/qmakewithstaticplugin/minimalqmake.pro diff --git a/examples/minimalqmake/src/Page1.qml b/examples/qmakewithstaticplugin/src/Page1.qml similarity index 100% rename from examples/minimalqmake/src/Page1.qml rename to examples/qmakewithstaticplugin/src/Page1.qml diff --git a/examples/minimalqmake/src/Page1Form.ui.qml b/examples/qmakewithstaticplugin/src/Page1Form.ui.qml similarity index 100% rename from examples/minimalqmake/src/Page1Form.ui.qml rename to examples/qmakewithstaticplugin/src/Page1Form.ui.qml diff --git a/examples/minimalqmake/src/kirigami-icons.qrc b/examples/qmakewithstaticplugin/src/kirigami-icons.qrc similarity index 100% rename from examples/minimalqmake/src/kirigami-icons.qrc rename to examples/qmakewithstaticplugin/src/kirigami-icons.qrc diff --git a/examples/minimalqmake/src/main.cpp b/examples/qmakewithstaticplugin/src/main.cpp similarity index 100% rename from examples/minimalqmake/src/main.cpp rename to examples/qmakewithstaticplugin/src/main.cpp diff --git a/examples/minimalqmake/src/main.qml b/examples/qmakewithstaticplugin/src/main.qml similarity index 100% rename from examples/minimalqmake/src/main.qml rename to examples/qmakewithstaticplugin/src/main.qml diff --git a/examples/minimalqmake/src/qml.qrc b/examples/qmakewithstaticplugin/src/qml.qrc similarity index 100% rename from examples/minimalqmake/src/qml.qrc rename to examples/qmakewithstaticplugin/src/qml.qrc diff --git a/examples/minimalqmake/src/qtquickcontrols2.conf b/examples/qmakewithstaticplugin/src/qtquickcontrols2.conf similarity index 100% rename from examples/minimalqmake/src/qtquickcontrols2.conf rename to examples/qmakewithstaticplugin/src/qtquickcontrols2.conf diff --git a/examples/minimalqmake/src/src.pro b/examples/qmakewithstaticplugin/src/src.pro similarity index 100% rename from examples/minimalqmake/src/src.pro rename to examples/qmakewithstaticplugin/src/src.pro