Booster is enabled for all builds

diff --git a/src/main.cpp b/src/main.cpp
index 8dfdd0f..982a1b7 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -57,10 +57,7 @@
 #include "devicekeys.h"
 #include "platformsettings.h"
 #include "dbusservice.h"
-
-#ifdef HAVE_BOOSTER
 #include <MDeclarativeCache>
-#endif
 
 #ifdef QMLJSDEBUGGER
 #include "qt_private/qdeclarativedebughelper_p.h"
@@ -90,14 +87,10 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) {
   QmlFileEngineHandler handler;
   Q_UNUSED(handler);
 
-  QDeclarativeView *view = new QDeclarativeView;
-#elif defined(HAVE_BOOSTER)
+  QDeclarativeView *view = MDeclarativeCache::qDeclarativeView();
+#elif defined(QT5)
   QGuiApplication *app = MDeclarativeCache::qApplication(argc, argv);
   QQuickView *view = MDeclarativeCache::qQuickView();
-#elif defined(QT5)
-  QGuiApplication::setAttribute(Qt::AA_X11InitThreads, true);
-  QGuiApplication *app = new QGuiApplication(argc, argv);
-  QQuickView *view = new QQuickView;
 #endif
 
 #ifdef QMLJSDEBUGGER

diff --git a/src/src.pro b/src/src.pro
index 0fb2890..bb0b0dc 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -11,13 +11,12 @@ qt4 {
     QT += declarative opengl
     CONFIG += mobility
     MOBILITY += location systeminfo
-    PKGCONFIG += qtsparql qmsystem2 libresourceqt1
+    PKGCONFIG += QtSparql qmsystem2 libresourceqt1 qdeclarative-boostable
 }
 
 qt5 {
     QT += qml quick
     PKGCONFIG += Qt5Sparql qmsystem2-qt5 libresourceqt5 qdeclarative5-boostable
-    DEFINES += HAVE_BOOSTER
 }
 
 SOURCES += main.cpp settings.cpp filenaming.cpp displaystate.cpp fsmonitor.cpp \