It's pretty clear that no one ever tested the kirigami.pro qmake file. The
second patch I'm not 100% sure about, but it seems to match what the
documentation tells us SHOULD be done.

/D
>From 8e4307346614943a940f11d2ee6159886c54ee83 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <d...@hohndel.org>
Date: Mon, 15 Aug 2016 16:39:21 -0700
Subject: [PATCH 1/2] More qmake fixes

So the qmake file didn't include the resource file, which of course made things
not work when built with qmake.

Since clearly no one else is using the qmake file but me, I also defined the
static build right there - feel free to change.

Signed-off-by: Dirk Hohndel <d...@hohndel.org>
---
 kirigami.pro | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kirigami.pro b/kirigami.pro
index f7d6fe6..ee77100 100644
--- a/kirigami.pro
+++ b/kirigami.pro
@@ -4,6 +4,8 @@ CONFIG += plugin
 QT          += qml quick gui svg
 HEADERS     += $$PWD/src/kirigamiplugin.h $$PWD/src/enums.h
 SOURCES     += $$PWD/src/kirigamiplugin.cpp $$PWD/src/enums.cpp
+DEFINES     += KIRIGAMI_BUILD_TYPE_STATIC
+RESOURCES   += $$PWD/kirigami.qrc
 
 API_VER=1.0
 
-- 
2.7.4 (Apple Git-66)

>From e8de9c0bbc4dbe1e75fc4c8cb2ee0285e98c118a Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <d...@hohndel.org>
Date: Mon, 15 Aug 2016 16:42:08 -0700
Subject: [PATCH 2/2] Q_RESOURCE_INIT macro has to be called by user

Calling this from within the library doesn't seem to be the right thing to do,
according to the documentation at http://doc.qt.io/qt-5/resources.html

Signed-off-by: Dirk Hohndel <d...@hohndel.org>
---
 src/kirigamiplugin.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/kirigamiplugin.cpp b/src/kirigamiplugin.cpp
index fc530b3..83b4dc2 100644
--- a/src/kirigamiplugin.cpp
+++ b/src/kirigamiplugin.cpp
@@ -43,10 +43,6 @@ QString KirigamiPlugin::componentPath(const QString &fileName) const
 
 void KirigamiPlugin::registerTypes(const char *uri)
 {
-#ifdef KIRIGAMI_BUILD_TYPE_STATIC
-    Q_INIT_RESOURCE(kirigami);
-#endif
-
     Q_ASSERT(uri == QLatin1String("org.kde.kirigami"));
     const QString style = QString::fromLatin1(qgetenv("QT_QUICK_CONTROLS_STYLE"));
 
-- 
2.7.4 (Apple Git-66)

Reply via email to