SF: Qt Systeminfo is not yet allowed in Harbour - ship our own version

leppa · Nov 9, 2015 · 948f2e2 · 948f2e2
1 parent 5c7cfbb
commit 948f2e2
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,6 @@
 * text=auto export-subst
 *.ai binary
 *.ts text eol=lf
+*.spec text eol=lf
 qtc_packaging/debian_harmattan/* text eof=lf
+rpm/lib/*.so* filter=lfs diff=lfs merge=lfs -text
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,6 @@
 /moc/
 /obj/
 /rcc/
-/rpm/*.spec
 /taot
 /taot_*
 /tmp/
diff --git a/rpm/harbour-taot.spec b/rpm/harbour-taot.spec
@@ -0,0 +1,11 @@
+# 
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.27
+# 
+
+Name:       harbour-taot
+
+# >> macros
+%define __requires_exclude ^libQt5SystemInfo.*$
+%define __provides_exclude_from ^%{_datadir}/.*$
+# << macros
diff --git a/rpm/harbour-taot.yaml b/rpm/harbour-taot.yaml
@@ -31,6 +31,7 @@ Requires:
 - sailfishsilica-qt5
 Files:
 - '%{_bindir}'
+- '%{_datadir}/%{name}/lib'
 - '%{_datadir}/%{name}/qml'
 - '%{_datadir}/applications/%{name}.desktop'
 - '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png'

diff --git a/rpm/lib/arm/libQt5SystemInfo.so.5 b/rpm/lib/arm/libQt5SystemInfo.so.5
diff --git a/rpm/lib/i386/libQt5SystemInfo.so.5 b/rpm/lib/i386/libQt5SystemInfo.so.5
diff --git a/taot.pro b/taot.pro
@@ -257,19 +257,23 @@ sailfish {
     TARGET = harbour-taot
 
     target.path = /usr/bin
+    libs.files = rpm/lib/$${QT_ARCH}/*
+    libs.path = /usr/share/$${TARGET}/lib
     ui.files = qml/*.js qml/sailfish/*
     ui.path = /usr/share/$${TARGET}/qml
     icon.files = $${TARGET}.png
     icon.path = /usr/share/icons/hicolor/86x86/apps
     desktopfile.files = rpm/$${TARGET}.desktop
     desktopfile.path = /usr/share/applications
 
-    INSTALLS += target ui icon desktopfile
+    INSTALLS += target libs ui icon desktopfile
 
     CONFIG += link_pkgconfig
     PKGCONFIG += sailfishapp
     INCLUDEPATH += /usr/include/sailfishapp
 
+    QMAKE_RPATHDIR += $$libs.path
+
     OTHER_FILES += $$files(rpm/*)
 }