From 93623e2638e52687af2de352f6a86099e78e57d9 Mon Sep 17 00:00:00 2001
From: Jacques GUILLOU <jacques.guillou@daimler.com>
Date: Mon, 26 Feb 2018 11:46:48 +0100
Subject: Fix "enable-widgets" option

Change-Id: I8bebd419b4c75bc7569fcf6c6aa389906924e307
Reviewed-by: Bernd Weimer <bernd.weimer@pelagicore.com>
---
 src/main-lib/main.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main-lib/main.h b/src/main-lib/main.h
index 9354d1d2..0d8919f6 100644
--- a/src/main-lib/main.h
+++ b/src/main-lib/main.h
@@ -48,13 +48,15 @@
 #if defined(AM_HEADLESS)
 #  include <QCoreApplication>
 typedef QCoreApplication MainBase;
-#elif defined(AM_ENABLE_WIDGETS)
-#  include <QApplication>
-typedef QApplication MainBase;
 #else
-#  include <QSurfaceFormat>
-#  include <QGuiApplication>
+#  if defined(AM_ENABLE_WIDGETS)
+#    include <QApplication>
+typedef QApplication MainBase;
+#  else
+#    include <QGuiApplication>
 typedef QGuiApplication MainBase;
+#  endif
+#  include <QSurfaceFormat>
 #endif
 
 #include <QtAppManInstaller/installationlocation.h>
-- 
cgit v1.2.3