shuffle stuff around and add directory for tests

18 files changed, 68 insertions, 57 deletions

diff --git a/harbour-unitmaster.pro b/harbour-unitmaster.pro
index a7024f6..26d5720 100644
--- a/harbour-unitmaster.pro
+++ b/harbour-unitmaster.pro
@@ -1,49 +1,3 @@
-# The name of your app.
-# NOTICE: name defined in TARGET has a corresponding QML filename.
-#         If name defined in TARGET is changed, following needs to be
-#         done to match new name:
-#         - corresponding QML filename must be changed
-#         - desktop icon filename must be changed
-#         - desktop filename must be changed
-#         - icon definition filename in desktop file must be changed
-TARGET = harbour-unitmaster
-
-QT += quick qml
-
-target.path = /usr/bin
-
-qml.files = qml
-qml.path = /usr/share/$${TARGET}
-
-desktop.files = $${TARGET}.desktop
-desktop.path = /usr/share/applications
-
-icon.files = $${TARGET}.png
-icon.path = /usr/share/icons/hicolor/86x86/apps
-
-INSTALLS += target qml desktop icon
-
-CONFIG += link_pkgconfig
-PKGCONFIG += sailfishapp
-INCLUDEPATH += /usr/include/sailfishapp
-
-OTHER_FILES += $$files(rpm/*) \
-    qml/pages/AboutPage.qml
-
-#CONFIG += sailfishapp
-
-SOURCES += src/unitmaster.cpp
-
-OTHER_FILES += \
-    qml/pages/QuantityModel.qml \
-    qml/pages/MassModel.qml \
-    qml/pages/SelectQuantityPage.qml \
-    qml/pages/QuantityPage.qml \
-    qml/pages/helpers.js \
-    qml/pages/LengthModel.qml \
-    qml/pages/TemperatureModel.qml \
-    harbour-unitmaster.desktop \
-    qml/harbour-unitmaster.qml \
-    rpm/harbour-unitmaster.yaml \
-    rpm/harbour-unitmaster.spec
-
+TEMPLATE = subdirs
+SUBDIRS = src tests
+CONFIG += ordered
diff --git a/rpm/harbour-unitmaster.yaml b/rpm/harbour-unitmaster.yaml
index 662aefc..e9ed7c6 100644
--- a/rpm/harbour-unitmaster.yaml
+++ b/rpm/harbour-unitmaster.yaml
@@ -18,15 +18,22 @@ PkgConfigBR:
 Requires:
 - sailfishsilica-qt5
 Files:
-- '%{_datadir}/applications'
-- '%{_datadir}/%{name}'
 - '%{_datadir}/icons/hicolor/86x86/apps/%{name}.png'
 - '%{_datadir}/applications/%{name}.desktop'
 - '%{_datadir}/%{name}/qml'
-- '%{_bindir}'
-- '%{_datadir}/icons/hicolor/86x86/apps'
-- /usr/bin
-- /usr/share/harbour-unitmaster
-- /usr/share/applications
-- /usr/share/icons/hicolor/86x86/apps
+- '%{_bindir}/%{name}'
 PkgBR: []
+
+SubPackages:
+    - Name: test
+      Summary: 'Tests for %{name}'
+      Group: Qt/Qt
+      AutoDepend: true
+      PkgConfigBR:
+      - Qt5QuickTest
+      Requires:
+      - qt5-qtdeclarative-import-qttest
+      Files:
+        - '%{_bindir}/tst-harbour-unitmaster'
+        - '%{_datadir}/tst-harbour-unitmaster/*.qml'
+        - '%{_datadir}/tst-harbour-unitmaster/*.sh'
diff --git a/harbour-unitmaster.desktop b/src/harbour-unitmaster.desktop
index 27dd6d4..27dd6d4 100644
--- a/harbour-unitmaster.desktop
+++ b/src/harbour-unitmaster.desktop
diff --git a/harbour-unitmaster.png b/src/harbour-unitmaster.png
index e54207a..e54207a 100644
--- a/harbour-unitmaster.png
+++ b/src/harbour-unitmaster.png
diff --git a/src/unitmaster.cpp b/src/main.cpp
index dfbb6d6..dfbb6d6 100644
--- a/src/unitmaster.cpp
+++ b/src/main.cpp
diff --git a/qml/harbour-unitmaster.qml b/src/qml/harbour-unitmaster.qml
index 5d3cf21..5d3cf21 100644
--- a/qml/harbour-unitmaster.qml
+++ b/src/qml/harbour-unitmaster.qml
diff --git a/qml/pages/AboutPage.qml b/src/qml/pages/AboutPage.qml
index 0810846..0810846 100644
--- a/qml/pages/AboutPage.qml
+++ b/src/qml/pages/AboutPage.qml
diff --git a/qml/pages/AngleModel.qml b/src/qml/pages/AngleModel.qml
index a81adb4..a81adb4 100644
--- a/qml/pages/AngleModel.qml
+++ b/src/qml/pages/AngleModel.qml
diff --git a/qml/pages/LengthModel.qml b/src/qml/pages/LengthModel.qml
index a374be3..a374be3 100644
--- a/qml/pages/LengthModel.qml
+++ b/src/qml/pages/LengthModel.qml
diff --git a/qml/pages/MassModel.qml b/src/qml/pages/MassModel.qml
index cadcdf0..cadcdf0 100644
--- a/qml/pages/MassModel.qml
+++ b/src/qml/pages/MassModel.qml
diff --git a/qml/pages/PressureModel.qml b/src/qml/pages/PressureModel.qml
index 2196f8a..2196f8a 100644
--- a/qml/pages/PressureModel.qml
+++ b/src/qml/pages/PressureModel.qml
diff --git a/qml/pages/QuantityModel.qml b/src/qml/pages/QuantityModel.qml
index f7e3844..f7e3844 100644
--- a/qml/pages/QuantityModel.qml
+++ b/src/qml/pages/QuantityModel.qml
diff --git a/qml/pages/QuantityPage.qml b/src/qml/pages/QuantityPage.qml
index 0d5c4de..0d5c4de 100644
--- a/qml/pages/QuantityPage.qml
+++ b/src/qml/pages/QuantityPage.qml
diff --git a/qml/pages/SelectQuantityPage.qml b/src/qml/pages/SelectQuantityPage.qml
index 4e1456d..4e1456d 100644
--- a/qml/pages/SelectQuantityPage.qml
+++ b/src/qml/pages/SelectQuantityPage.qml
diff --git a/qml/pages/TemperatureModel.qml b/src/qml/pages/TemperatureModel.qml
index 74fc7d2..74fc7d2 100644
--- a/qml/pages/TemperatureModel.qml
+++ b/src/qml/pages/TemperatureModel.qml
diff --git a/qml/pages/helpers.js b/src/qml/pages/helpers.js
index dd7ad7c..dd7ad7c 100644
--- a/qml/pages/helpers.js
+++ b/src/qml/pages/helpers.js
diff --git a/src/src.pro b/src/src.pro
new file mode 100644
index 0000000..82aa2df
--- /dev/null
+++ b/src/src.pro
@@ -0,0 +1,47 @@
+TEMPLATE=app
+
+# The name of your app.
+# NOTICE: name defined in TARGET has a corresponding QML filename.
+#         If name defined in TARGET is changed, following needs to be
+#         done to match new name:
+#         - corresponding QML filename must be changed
+#         - desktop icon filename must be changed
+#         - desktop filename must be changed
+#         - icon definition filename in desktop file must be changed
+TARGET = harbour-unitmaster
+
+QT += quick qml
+
+CONFIG += link_pkgconfig
+PKGCONFIG += sailfishapp
+INCLUDEPATH += /usr/include/sailfishapp
+
+target.path = /usr/bin
+
+qml.files = qml
+qml.path = /usr/share/$${TARGET}
+
+desktop.files = $${TARGET}.desktop
+desktop.path = /usr/share/applications
+
+icon.files = $${TARGET}.png
+icon.path = /usr/share/icons/hicolor/86x86/apps
+
+INSTALLS += target qml desktop icon
+
+#CONFIG += sailfishapp
+
+SOURCES += main.cpp
+
+OTHER_FILES += \
+    qml/pages/QuantityModel.qml \
+    qml/pages/MassModel.qml \
+    qml/pages/SelectQuantityPage.qml \
+    qml/pages/QuantityPage.qml \
+    qml/pages/helpers.js \
+    qml/pages/LengthModel.qml \
+    qml/pages/TemperatureModel.qml \
+    qml/pages/AboutPage.qml \
+    harbour-unitmaster.desktop \
+    qml/harbour-unitmaster.qml \
+    ../rpm/$${TARGET}.spec
diff --git a/tests/main.cpp b/tests/main.cpp
new file mode 100644
index 0000000..0c5d40e
--- /dev/null
+++ b/tests/main.cpp
@@ -0,0 +1,3 @@
+#include <QtQuickTest/quicktest.h>
+
+QUICK_TEST_MAIN(UnitMasterTestSet)