aboutsummaryrefslogtreecommitdiff
path: root/lumina-config/lumina-config.pro
diff options
context:
space:
mode:
authorKen Moore <ken@pcbsd.org>2014-12-18 07:47:48 -0500
committerKen Moore <ken@pcbsd.org>2014-12-18 07:47:48 -0500
commit71c2fda95224f0a04316c5f1059628d33564ca43 (patch)
treeca74dbe49dd2f555e73893e7f5f06154d6dab763 /lumina-config/lumina-config.pro
parentOops, forgot to add knowledge of the new "Wine" app category to the userbutton. (diff)
downloadlumina-71c2fda95224f0a04316c5f1059628d33564ca43.tar.gz
lumina-71c2fda95224f0a04316c5f1059628d33564ca43.tar.bz2
lumina-71c2fda95224f0a04316c5f1059628d33564ca43.zip
Commit a checkpoint on the conversion of Lumina to Qt5.
It is functional at the moment, but still has a few rough edges with regards to the X11 background interface (due to the move from XLib to XCB in Qt5). This reulst in some of the window manager interactions not behaving properly (such as sticky status on panels).
Diffstat (limited to 'lumina-config/lumina-config.pro')
-rw-r--r--lumina-config/lumina-config.pro15
1 files changed, 8 insertions, 7 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
bgstack15