Header cleanup, fixing syncqt warnings

Change-Id: Ide43048bd3d5dc9177029ff64e611973d0ee12f4
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>

9 files changed, 19 insertions, 13 deletions

diff --git a/src/launcher-lib/launcher-lib.pro b/src/launcher-lib/launcher-lib.pro
index fba6deac..c6d40678 100644
--- a/src/launcher-lib/launcher-lib.pro
+++ b/src/launcher-lib/launcher-lib.pro
@@ -5,6 +5,7 @@ MODULE = appman_launcher
 load(am-config)
 
 QT = qml dbus core-private
+enable-widgets:QT *= widgets
 !headless:QT += quick gui gui-private quick-private
 QT_FOR_PRIVATE *= \
     appman_common-private \
diff --git a/src/launcher-lib/launchermain.h b/src/launcher-lib/launchermain.h
index 8ee9f52c..7ca97b8c 100644
--- a/src/launcher-lib/launchermain.h
+++ b/src/launcher-lib/launchermain.h
@@ -47,8 +47,13 @@
 #if defined(AM_HEADLESS)
 #  include <QCoreApplication>
 typedef QCoreApplication LauncherMainBase;
+#elif defined(AM_ENABLE_WIDGETS)
+#  include <QApplication>
+#  include <QSurfaceFormat>
+typedef QApplication LauncherMainBase;
 #else
 #  include <QGuiApplication>
+#  include <QSurfaceFormat>
 typedef QGuiApplication LauncherMainBase;
 #endif
 
diff --git a/src/main-lib/main.h b/src/main-lib/main.h
index e80a0411..fff09bee 100644
--- a/src/main-lib/main.h
+++ b/src/main-lib/main.h
@@ -48,15 +48,14 @@
 #if defined(AM_HEADLESS)
 #  include <QCoreApplication>
 typedef QCoreApplication MainBase;
-#else
-#  if defined(AM_ENABLE_WIDGETS)
-#    include <QApplication>
+#elif defined(AM_ENABLE_WIDGETS)
+#  include <QApplication>
+#  include <QSurfaceFormat>
 typedef QApplication MainBase;
-#  else
-#    include <QGuiApplication>
-typedef QGuiApplication MainBase;
-#  endif
+#else
+#  include <QGuiApplication>
 #  include <QSurfaceFormat>
+typedef QGuiApplication MainBase;
 #endif
 
 #include <QtAppManInstaller/installationlocation.h>
diff --git a/src/monitor-lib/frametimer.h b/src/monitor-lib/frametimer.h
index 9e1a69e1..17339e53 100644
--- a/src/monitor-lib/frametimer.h
+++ b/src/monitor-lib/frametimer.h
@@ -42,7 +42,7 @@
 #pragma once
 
 #include <QElapsedTimer>
-#include "global.h"
+#include <QtAppManCommon/global.h>
 #include <limits>
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/monitor-lib/processmonitor.h b/src/monitor-lib/processmonitor.h
index f9a9631a..19812d33 100644
--- a/src/monitor-lib/processmonitor.h
+++ b/src/monitor-lib/processmonitor.h
@@ -47,8 +47,8 @@
 #include <QVariant>
 #include <QHash>
 
-#include "application.h"
-#include "applicationmanager.h"
+#include <QtAppManApplication/application.h>
+#include <QtAppManManager/applicationmanager.h>
 
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/window-lib/touchemulation.cpp b/src/window-lib/touchemulation.cpp
index c339d4f2..18a183a6 100644
--- a/src/window-lib/touchemulation.cpp
+++ b/src/window-lib/touchemulation.cpp
@@ -42,7 +42,7 @@
 #include <QtAppManCommon/global.h>
 #include "touchemulation.h"
 #if defined(AM_ENABLE_TOUCH_EMULATION)
-#  include "touchemulation_x11.h"
+#  include "touchemulation_x11_p.h"
 #endif
 
 QT_BEGIN_NAMESPACE_AM
diff --git a/src/window-lib/touchemulation_x11.cpp b/src/window-lib/touchemulation_x11.cpp
index 53311dec..7e655343 100644
--- a/src/window-lib/touchemulation_x11.cpp
+++ b/src/window-lib/touchemulation_x11.cpp
@@ -41,7 +41,7 @@
 
 #include <QtAppManCommon/global.h>
 
-#include "touchemulation_x11.h"
+#include "touchemulation_x11_p.h"
 
 #include <QGuiApplication>
 #include <QMouseEvent>
diff --git a/src/window-lib/touchemulation_x11.h b/src/window-lib/touchemulation_x11_p.h
index b04ffb2c..4f751fa5 100644
--- a/src/window-lib/touchemulation_x11.h
+++ b/src/window-lib/touchemulation_x11_p.h
@@ -81,3 +81,4 @@ private:
 QT_END_NAMESPACE_AM
 
 #endif // AM_ENABLE_TOUCH_EMULATION
+// We mean it. Dummy comment since syncqt needs this also for completely private Qt modules.
diff --git a/src/window-lib/window-lib.pro b/src/window-lib/window-lib.pro
index 2f0272c2..6f5743e2 100644
--- a/src/window-lib/window-lib.pro
+++ b/src/window-lib/window-lib.pro
@@ -50,7 +50,7 @@ multi-process:!headless {
 !headless:config_touchemulation {
     PKGCONFIG *= xcb x11 xi
     QT *= gui-private testlib
-    HEADERS += touchemulation_x11.h
+    HEADERS += touchemulation_x11_p.h
     SOURCES += touchemulation_x11.cpp
 }