Complete restructure of current code tree

42 files changed, 37 insertions, 1 deletions

diff --git a/rwa-support-desktop.pro b/rwa-support-desktop.pro
new file mode 100644
index 0000000..1ecb64f
--- /dev/null
+++ b/rwa-support-desktop.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+SUBDIRS = rwa-support-desktopapp tests
diff --git a/images/clipboard.png.url b/rwa-support-desktopapp/images/clipboard.png.url
index a023a15..a023a15 100644
--- a/images/clipboard.png.url
+++ b/rwa-support-desktopapp/images/clipboard.png.url
diff --git a/images/into-clipboard.svg b/rwa-support-desktopapp/images/into-clipboard.svg
index ca9020e..ca9020e 100644
--- a/images/into-clipboard.svg
+++ b/rwa-support-desktopapp/images/into-clipboard.svg
diff --git a/locales/de_DE.qm b/rwa-support-desktopapp/locales/de_DE.qm
index 453dcd4..453dcd4 100644
--- a/locales/de_DE.qm
+++ b/rwa-support-desktopapp/locales/de_DE.qm
diff --git a/locales/de_DE.ts b/rwa-support-desktopapp/locales/de_DE.ts
index 1582fcc..1582fcc 100644
--- a/locales/de_DE.ts
+++ b/rwa-support-desktopapp/locales/de_DE.ts
diff --git a/locales/es_ES.qm b/rwa-support-desktopapp/locales/es_ES.qm
index 2d4045c..2d4045c 100644
--- a/locales/es_ES.qm
+++ b/rwa-support-desktopapp/locales/es_ES.qm
diff --git a/locales/es_ES.ts b/rwa-support-desktopapp/locales/es_ES.ts
index f69359e..f69359e 100644
--- a/locales/es_ES.ts
+++ b/rwa-support-desktopapp/locales/es_ES.ts
diff --git a/locales/main_en.qm b/rwa-support-desktopapp/locales/main_en.qm
index a0de2c8..a0de2c8 100644
--- a/locales/main_en.qm
+++ b/rwa-support-desktopapp/locales/main_en.qm
diff --git a/locales/main_en.ts b/rwa-support-desktopapp/locales/main_en.ts
index 7e033d1..7e033d1 100644
--- a/locales/main_en.ts
+++ b/rwa-support-desktopapp/locales/main_en.ts
diff --git a/qml.qrc b/rwa-support-desktopapp/qml.qrc
index 04ee201..04ee201 100644
--- a/qml.qrc
+++ b/rwa-support-desktopapp/qml.qrc
diff --git a/qtquickcontrols2.conf b/rwa-support-desktopapp/qtquickcontrols2.conf
index 8bcc85b..8bcc85b 100644
--- a/qtquickcontrols2.conf
+++ b/rwa-support-desktopapp/qtquickcontrols2.conf
diff --git a/rwa-support-desktopapp.pro b/rwa-support-desktopapp/rwa-support-desktopapp.pro
index 96ecec3..a013742 100644
--- a/rwa-support-desktopapp.pro
+++ b/rwa-support-desktopapp/rwa-support-desktopapp.pro
@@ -26,6 +26,20 @@ QT += quick
 QT += quickcontrols2
 QT += widgets
 
+
+QT += testlib
+CONFIG += testcase
+CONFIG += no_testcase_installs
+
+#test_conf {
+#   TARGET = rwa-support-desktop-tests
+#   QT += testlib
+#   SOURCES += testqstring.cpp
+#   HEADERS +=
+#} else {
+#  SOURCES += src/main.cpp
+#}
+
 message(Building with DBUS (Freedesktop notifications) support)
 DEFINES += USE_DBUS
 QT += dbus
@@ -52,7 +66,7 @@ SOURCES += src/main.cpp \
     src/RWAHost.cpp \
     src/DBusAPI.cpp \
     src/scenes/remote_control/remote_control_manager.cpp \
-    src/scenes/add_rwahost_wizard/add_rwahost_wizard.cpp
+    src/scenes/add_rwahost_wizard/add_rwahost_wizard.cpp \
 
 HEADERS += src/RWADBusAdaptor.h \
     src/main_qmladaptor.h \
diff --git a/src/DBusAPI.cpp b/rwa-support-desktopapp/src/DBusAPI.cpp
index 9a0f8de..9a0f8de 100644
--- a/src/DBusAPI.cpp
+++ b/rwa-support-desktopapp/src/DBusAPI.cpp
diff --git a/src/DBusAPI.h b/rwa-support-desktopapp/src/DBusAPI.h
index 63dbe68..63dbe68 100644
--- a/src/DBusAPI.h
+++ b/rwa-support-desktopapp/src/DBusAPI.h
diff --git a/src/ListItem.qml b/rwa-support-desktopapp/src/ListItem.qml
index fa83f4b..fa83f4b 100644
--- a/src/ListItem.qml
+++ b/rwa-support-desktopapp/src/ListItem.qml
diff --git a/src/RWADBusAdaptor.cpp b/rwa-support-desktopapp/src/RWADBusAdaptor.cpp
index 6c1504e..6c1504e 100644
--- a/src/RWADBusAdaptor.cpp
+++ b/rwa-support-desktopapp/src/RWADBusAdaptor.cpp
diff --git a/src/RWADBusAdaptor.h b/rwa-support-desktopapp/src/RWADBusAdaptor.h
index 77f4b6c..77f4b6c 100644
--- a/src/RWADBusAdaptor.h
+++ b/rwa-support-desktopapp/src/RWADBusAdaptor.h
diff --git a/src/RWAHost.cpp b/rwa-support-desktopapp/src/RWAHost.cpp
index f31dc60..f31dc60 100644
--- a/src/RWAHost.cpp
+++ b/rwa-support-desktopapp/src/RWAHost.cpp
diff --git a/src/RWAHost.h b/rwa-support-desktopapp/src/RWAHost.h
index cd3b1ce..cd3b1ce 100644
--- a/src/RWAHost.h
+++ b/rwa-support-desktopapp/src/RWAHost.h
diff --git a/src/RWAHostModel.cpp b/rwa-support-desktopapp/src/RWAHostModel.cpp
index 5f62adc..5f62adc 100644
--- a/src/RWAHostModel.cpp
+++ b/rwa-support-desktopapp/src/RWAHostModel.cpp
diff --git a/src/RWAHostModel.h b/rwa-support-desktopapp/src/RWAHostModel.h
index 8697df2..8697df2 100644
--- a/src/RWAHostModel.h
+++ b/rwa-support-desktopapp/src/RWAHostModel.h
diff --git a/src/Toast.qml b/rwa-support-desktopapp/src/Toast.qml
index 7a18dc8..7a18dc8 100644
--- a/src/Toast.qml
+++ b/rwa-support-desktopapp/src/Toast.qml
diff --git a/src/ToastManager.qml b/rwa-support-desktopapp/src/ToastManager.qml
index 2f1600f..2f1600f 100644
--- a/src/ToastManager.qml
+++ b/rwa-support-desktopapp/src/ToastManager.qml
diff --git a/src/main.cpp b/rwa-support-desktopapp/src/main.cpp
index e29c8db..e29c8db 100644
--- a/src/main.cpp
+++ b/rwa-support-desktopapp/src/main.cpp
diff --git a/src/main.qml b/rwa-support-desktopapp/src/main.qml
index a622c18..a622c18 100644
--- a/src/main.qml
+++ b/rwa-support-desktopapp/src/main.qml
diff --git a/src/main_qmladaptor.cpp b/rwa-support-desktopapp/src/main_qmladaptor.cpp
index 688b993..688b993 100644
--- a/src/main_qmladaptor.cpp
+++ b/rwa-support-desktopapp/src/main_qmladaptor.cpp
diff --git a/src/main_qmladaptor.h b/rwa-support-desktopapp/src/main_qmladaptor.h
index 70c075b..70c075b 100644
--- a/src/main_qmladaptor.h
+++ b/rwa-support-desktopapp/src/main_qmladaptor.h
diff --git a/src/scenes/Scene_no_server_available.qml b/rwa-support-desktopapp/src/scenes/Scene_no_server_available.qml
index 7b99b55..7b99b55 100644
--- a/src/scenes/Scene_no_server_available.qml
+++ b/rwa-support-desktopapp/src/scenes/Scene_no_server_available.qml
diff --git a/src/scenes/Scene_placeholder.qml b/rwa-support-desktopapp/src/scenes/Scene_placeholder.qml
index f492e00..f492e00 100644
--- a/src/scenes/Scene_placeholder.qml
+++ b/rwa-support-desktopapp/src/scenes/Scene_placeholder.qml
diff --git a/src/scenes/Scene_remote_view.qml b/rwa-support-desktopapp/src/scenes/Scene_remote_view.qml
index 436d8aa..436d8aa 100644
--- a/src/scenes/Scene_remote_view.qml
+++ b/rwa-support-desktopapp/src/scenes/Scene_remote_view.qml
diff --git a/src/scenes/Scene_settings.qml b/rwa-support-desktopapp/src/scenes/Scene_settings.qml
index e2f89da..e2f89da 100644
--- a/src/scenes/Scene_settings.qml
+++ b/rwa-support-desktopapp/src/scenes/Scene_settings.qml
diff --git a/src/scenes/add_rwahost_wizard/Scene_step_1.qml b/rwa-support-desktopapp/src/scenes/add_rwahost_wizard/Scene_step_1.qml
index 873e0fd..873e0fd 100644
--- a/src/scenes/add_rwahost_wizard/Scene_step_1.qml
+++ b/rwa-support-desktopapp/src/scenes/add_rwahost_wizard/Scene_step_1.qml
diff --git a/src/scenes/add_rwahost_wizard/add_rwahost_wizard.cpp b/rwa-support-desktopapp/src/scenes/add_rwahost_wizard/add_rwahost_wizard.cpp
index 7adbdf9..7adbdf9 100644
--- a/src/scenes/add_rwahost_wizard/add_rwahost_wizard.cpp
+++ b/rwa-support-desktopapp/src/scenes/add_rwahost_wizard/add_rwahost_wizard.cpp
diff --git a/src/scenes/add_rwahost_wizard/add_rwahost_wizard.h b/rwa-support-desktopapp/src/scenes/add_rwahost_wizard/add_rwahost_wizard.h
index f019be1..f019be1 100644
--- a/src/scenes/add_rwahost_wizard/add_rwahost_wizard.h
+++ b/rwa-support-desktopapp/src/scenes/add_rwahost_wizard/add_rwahost_wizard.h
diff --git a/src/scenes/remote_control/Scene_remote_control.qml b/rwa-support-desktopapp/src/scenes/remote_control/Scene_remote_control.qml
index dc152ef..dc152ef 100644
--- a/src/scenes/remote_control/Scene_remote_control.qml
+++ b/rwa-support-desktopapp/src/scenes/remote_control/Scene_remote_control.qml
diff --git a/src/scenes/remote_control/remote_control_manager.cpp b/rwa-support-desktopapp/src/scenes/remote_control/remote_control_manager.cpp
index b76ea2a..b76ea2a 100644
--- a/src/scenes/remote_control/remote_control_manager.cpp
+++ b/rwa-support-desktopapp/src/scenes/remote_control/remote_control_manager.cpp
diff --git a/src/scenes/remote_control/remote_control_manager.h b/rwa-support-desktopapp/src/scenes/remote_control/remote_control_manager.h
index 4554724..4554724 100644
--- a/src/scenes/remote_control/remote_control_manager.h
+++ b/rwa-support-desktopapp/src/scenes/remote_control/remote_control_manager.h
diff --git a/src/session.cpp b/rwa-support-desktopapp/src/session.cpp
index 25a8512..25a8512 100644
--- a/src/session.cpp
+++ b/rwa-support-desktopapp/src/session.cpp
diff --git a/src/session.h b/rwa-support-desktopapp/src/session.h
index e1c924f..e1c924f 100644
--- a/src/session.h
+++ b/rwa-support-desktopapp/src/session.h
diff --git a/update_locales.sh b/rwa-support-desktopapp/update_locales.sh
index 8c05ece..8c05ece 100755
--- a/update_locales.sh
+++ b/rwa-support-desktopapp/update_locales.sh
diff --git a/tests/testqstring.cpp b/tests/testqstring.cpp
new file mode 100644
index 0000000..20ecf78
--- /dev/null
+++ b/tests/testqstring.cpp
@@ -0,0 +1,15 @@
+#include <QtTest/QtTest>
+
+class TestQString: public QObject {
+    Q_OBJECT
+private slots:
+    void toUpper();
+};
+
+void TestQString::toUpper() {
+    QString str = "Hello";
+    QCOMPARE(str.toUpper(), QString("HELLO"));
+}
+
+QTEST_MAIN(TestQString)
+#include "testqstring.moc"
diff --git a/tests/tests.pro b/tests/tests.pro
new file mode 100644
index 0000000..0f9e09e
--- /dev/null
+++ b/tests/tests.pro
@@ -0,0 +1,4 @@
+QT += testlib
+
+SOURCES += testqstring.cpp
+