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-open | |
| 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-open')
| -rw-r--r-- | lumina-open/LFileDialog.h | 1 | ||||
| -rw-r--r-- | lumina-open/lumina-open.pro | 1 | ||||
| -rw-r--r-- | lumina-open/main.cpp | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/lumina-open/LFileDialog.h b/lumina-open/LFileDialog.h index 27f038d6..eaed3625 100644 --- a/lumina-open/LFileDialog.h +++ b/lumina-open/LFileDialog.h @@ -19,6 +19,7 @@ #include <QSettings> #include <QTextStream> #include <QTreeWidgetItem> +#include <QAction> #include <LuminaXDG.h> //From libLuminaUtils #include <LuminaUtils.h> diff --git a/lumina-open/lumina-open.pro b/lumina-open/lumina-open.pro index b70d6b27..ce0e231d 100644 --- a/lumina-open/lumina-open.pro +++ b/lumina-open/lumina-open.pro @@ -1,5 +1,6 @@ QT += core gui +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras TARGET = lumina-open isEmpty(PREFIX) { diff --git a/lumina-open/main.cpp b/lumina-open/main.cpp index 4fcf70b7..a92a585f 100644 --- a/lumina-open/main.cpp +++ b/lumina-open/main.cpp @@ -125,8 +125,8 @@ QString cmdFromUser(int argc, char **argv, QString inFile, QString extension, QS qDebug() << "Locale:" << langCode; //Load current encoding for this locale - QTextCodec::setCodecForTr( QTextCodec::codecForLocale() ); //make sure to use the same codec - qDebug() << "Locale Encoding:" << QTextCodec::codecForLocale()->name(); + //QTextCodec::setCodecForTr( QTextCodec::codecForLocale() ); //make sure to use the same codec + //qDebug() << "Locale Encoding:" << QTextCodec::codecForLocale()->name(); LFileDialog w; if(inFile.startsWith(extension)){ |