diff options
| author | Ken Moore <ken@pcbsd.org> | 2014-12-18 07:47:48 -0500 |
|---|---|---|
| committer | Ken Moore <ken@pcbsd.org> | 2014-12-18 07:47:48 -0500 |
| commit | 71c2fda95224f0a04316c5f1059628d33564ca43 (patch) | |
| tree | ca74dbe49dd2f555e73893e7f5f06154d6dab763 /lumina-search | |
| parent | Oops, forgot to add knowledge of the new "Wine" app category to the userbutton. (diff) | |
| download | lumina-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-search')
| -rw-r--r-- | lumina-search/lumina-search.pro | 13 | ||||
| -rw-r--r-- | lumina-search/main.cpp | 5 |
2 files changed, 8 insertions, 10 deletions
diff --git a/lumina-search/lumina-search.pro b/lumina-search/lumina-search.pro index 3f428c6a..fcc6ae0f 100644 --- a/lumina-search/lumina-search.pro +++ b/lumina-search/lumina-search.pro @@ -1,5 +1,6 @@ QT += core gui +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = lumina-search isEmpty(PREFIX) { @@ -20,16 +21,10 @@ FORMS += MainUI.ui INCLUDEPATH += ../libLumina $$PREFIX/include - LIBS += -L../libLumina -lLuminaUtils -freebsd-* { - LIBS += -lQtSolutions_SingleApplication-head -} +LIBS += -L../libLumina -lLuminaUtils + +LRELEASE = $$PREFIX/lib/qt5/bin/lrelease -openbsd-g++4 { - LRELEASE = lrelease4 -} else { - LRELEASE = lrelease-qt4 -} QMAKE_LIBDIR = ../libLumina DEPENDPATH += ../libLumina diff --git a/lumina-search/main.cpp b/lumina-search/main.cpp index 886884d5..a4d04d4b 100644 --- a/lumina-search/main.cpp +++ b/lumina-search/main.cpp @@ -1,5 +1,5 @@ #include <QTranslator> -#include <QtGui/QApplication> +#include <QApplication> #include <QDebug> #include <QFile> @@ -9,8 +9,11 @@ int main(int argc, char ** argv) { + //qDebug() << "Init App..."; QApplication a(argc, argv); + //qDebug() << "Init Theme Engine..."; LuminaThemeEngine theme(&a); + //qDebug() << "Load Translations..."; a.setApplicationName("Search for..."); QTranslator translator; QLocale mylocale; |