diff options
| author | Ken Moore <ken@ixsystems.com> | 2016-11-07 14:21:08 -0500 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2016-11-07 14:21:08 -0500 |
| commit | 1fa6c08c45c07da3d1c0d369d58db31ef8fb9361 (patch) | |
| tree | cd9e82fc2de32664da482ecce71c0c0f70ebecf6 /src-qt5/core/lumina-session | |
| parent | Fix up the pkg-plist for the new libLumina depreciation. (diff) | |
| parent | Merge branch 'master' of github.com:trueos/lumina (diff) | |
| download | lumina-1fa6c08c45c07da3d1c0d369d58db31ef8fb9361.tar.gz lumina-1fa6c08c45c07da3d1c0d369d58db31ef8fb9361.tar.bz2 lumina-1fa6c08c45c07da3d1c0d369d58db31ef8fb9361.zip | |
Merge branch 'master' of github.com:trueos/lumina
Diffstat (limited to 'src-qt5/core/lumina-session')
| -rw-r--r-- | src-qt5/core/lumina-session/lumina-session.pro | 6 | ||||
| -rw-r--r-- | src-qt5/core/lumina-session/main.cpp | 5 | ||||
| -rw-r--r-- | src-qt5/core/lumina-session/session.cpp | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src-qt5/core/lumina-session/lumina-session.pro b/src-qt5/core/lumina-session/lumina-session.pro index 91a5f891..dc697a34 100644 --- a/src-qt5/core/lumina-session/lumina-session.pro +++ b/src-qt5/core/lumina-session/lumina-session.pro @@ -6,9 +6,9 @@ QT = core widgets TARGET = start-lumina-desktop target.path = $${L_BINDIR} - -LIBS += -lLuminaUtils -DEPENDPATH += ../libLumina +include(../libLumina/LDesktopUtils.pri) +include(../libLumina/LuminaXDG.pri) +include(../libLumina/LuminaThemes.pri) SOURCES += main.cpp \ session.cpp diff --git a/src-qt5/core/lumina-session/main.cpp b/src-qt5/core/lumina-session/main.cpp index 77e553d4..73af45f9 100644 --- a/src-qt5/core/lumina-session/main.cpp +++ b/src-qt5/core/lumina-session/main.cpp @@ -10,7 +10,8 @@ #include <QString> #include "session.h" -#include <LuminaUtils.h> +#include <LUtils.h> +#include <LDesktopUtils.h> #include <LuminaOS.h> #include <LuminaThemes.h> #include <LuminaXDG.h> @@ -21,7 +22,7 @@ int main(int argc, char ** argv) { if (argc > 1) { if (QString(argv[1]) == QString("--version")){ - qDebug() << LUtils::LuminaDesktopVersion(); + qDebug() << LDesktopUtils::LuminaDesktopVersion(); return 0; } } diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index c689c9a3..10953f12 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -13,7 +13,7 @@ #include <QSettings> #include <QDir> -#include <LuminaUtils.h> +#include <LUtils.h> #include <LuminaOS.h> void LSession::stopall(){ |