2 files changed, 14 insertions, 19 deletions
diff --git a/lumina-config/lumina-config.pro b/lumina-config/lumina-config.pro
index ff8211b3..ec6d09e3 100644
--- a/lumina-config/lumina-config.pro
+++ b/lumina-config/lumina-config.pro
@@ -1,5 +1,6 @@
 
 QT       += core gui
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras network
 
 TARGET = lumina-config
 isEmpty(PREFIX) {
@@ -34,17 +35,17 @@ FORMS    += mainUI.ui \
 INCLUDEPATH += ../libLumina $$PREFIX/include
 
   LIBS += -L../libLumina -lLuminaUtils
-freebsd-* {
-  LIBS     += -lQtSolutions_SingleApplication-head
-}
-openbsd-g++4 {
-  LIBS     += -lQtSolutions_SingleApplication-head
-}
+#freebsd-* {
+#  LIBS     += -lQtSolutions_SingleApplication-head
+#}
+#openbsd-g++4 {
+#  LIBS     += -lQtSolutions_SingleApplication-head
+#}
 
 openbsd-g++4 {
   LRELEASE = lrelease4
 } else {
-  LRELEASE = lrelease-qt4
+  LRELEASE = $$PREFIX/lib/qt5/bin/lrelease
 }
 
 QMAKE_LIBDIR	= ../libLumina
diff --git a/lumina-config/main.cpp b/lumina-config/main.cpp
index 27af600d..af5c0ab9 100644
--- a/lumina-config/main.cpp
+++ b/lumina-config/main.cpp
@@ -1,25 +1,19 @@
 #include <QTranslator>
 
-#ifdef __FreeBSD__
-  #include <qtsingleapplication.h>
-#endif
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QDebug>
 #include <QFile>
 
 #include "mainUI.h"
 #include <LuminaOS.h>
 #include <LuminaThemes.h>
+#include <LuminaSingleApplication.h>
 
 int main(int argc, char ** argv)
 {
-    #ifndef __FreeBSD__
-    QApplication a(argc, argv);
-    #else
-    QtSingleApplication a(argc, argv);
-    if( a.isRunning() )
-      return !(a.sendMessage("show"));
-    #endif
+    LSingleApplication a(argc, argv);
+    if(!a.isPrimaryProcess()){ return 0; }
+    
     LuminaThemeEngine theme(&a);
     QTranslator translator;
     QLocale mylocale;
@@ -32,7 +26,7 @@ int main(int argc, char ** argv)
 
 
     MainUI w;
-    QObject::connect(&a, SIGNAL(messageReceived(const QString&)), &w, SLOT(slotSingleInstance()) );
+    QObject::connect(&a, SIGNAL(InputsAvailable(QStringList)), &w, SLOT(slotSingleInstance()) );
     QObject::connect(&theme, SIGNAL(updateIcons()), &w, SLOT(setupIcons()) );
     w.show();