diff options
| author | Ken Moore <ken@ixsystems.com> | 2016-11-07 13:52:20 -0500 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2016-11-07 13:52:20 -0500 |
| commit | 7ab900e41f5f15adccd573d459a80fe60cf6a044 (patch) | |
| tree | 6effe3593f7b9f942fe7aaf5626ebe039262af3b /src-qt5/desktop-utils/lumina-calculator | |
| parent | Convert the ResizeMenu class into it's own files: (diff) | |
| download | lumina-7ab900e41f5f15adccd573d459a80fe60cf6a044.tar.gz lumina-7ab900e41f5f15adccd573d459a80fe60cf6a044.tar.bz2 lumina-7ab900e41f5f15adccd573d459a80fe60cf6a044.zip | |
LARGE UPDATE:
1) Dismantle the Lumina library completely.
2) Setup lots of small subproject files (.pri) for the individual classes within the old library.
3) Move all the Lumina binaries to use the new subproject files
4) Split up the LuminaUtils class/files into LUtils and LDesktopUtils (generic utilities, and desktop-specific utilities)
Diffstat (limited to 'src-qt5/desktop-utils/lumina-calculator')
| -rw-r--r-- | src-qt5/desktop-utils/lumina-calculator/lumina-calculator.pro | 10 | ||||
| -rw-r--r-- | src-qt5/desktop-utils/lumina-calculator/main.cpp | 2 | ||||
| -rw-r--r-- | src-qt5/desktop-utils/lumina-calculator/mainUI.cpp | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src-qt5/desktop-utils/lumina-calculator/lumina-calculator.pro b/src-qt5/desktop-utils/lumina-calculator/lumina-calculator.pro index 38e22b37..efb9e68c 100644 --- a/src-qt5/desktop-utils/lumina-calculator/lumina-calculator.pro +++ b/src-qt5/desktop-utils/lumina-calculator/lumina-calculator.pro @@ -5,6 +5,12 @@ QT += core gui widgets TARGET = lumina-calculator target.path = $${L_BINDIR} +#include all the special classes from the Lumina tree +include(../../core/libLumina/LUtils.pri) #includes LUtils +include(../../core/libLumina/LuminaXDG.pri) +include(../../core/libLumina/LuminaSingleApplication.pri) +include(../../core/libLumina/LuminaThemes.pri) + HEADERS += mainUI.h \ EqValidator.h @@ -13,10 +19,6 @@ SOURCES += main.cpp \ FORMS += mainUI.ui -LIBS += -lLuminaUtils - -DEPENDPATH += ../../libLumina - TRANSLATIONS = i18n/l-calc_af.ts \ i18n/l-calc_ar.ts \ i18n/l-calc_az.ts \ diff --git a/src-qt5/desktop-utils/lumina-calculator/main.cpp b/src-qt5/desktop-utils/lumina-calculator/main.cpp index ea1ae60c..da57763a 100644 --- a/src-qt5/desktop-utils/lumina-calculator/main.cpp +++ b/src-qt5/desktop-utils/lumina-calculator/main.cpp @@ -8,7 +8,7 @@ #include <QDebug> #include <LuminaThemes.h> -#include <LuminaUtils.h> +#include <LUtils.h> #include "mainUI.h" diff --git a/src-qt5/desktop-utils/lumina-calculator/mainUI.cpp b/src-qt5/desktop-utils/lumina-calculator/mainUI.cpp index 3da9ba6d..fcc39fd2 100644 --- a/src-qt5/desktop-utils/lumina-calculator/mainUI.cpp +++ b/src-qt5/desktop-utils/lumina-calculator/mainUI.cpp @@ -10,8 +10,9 @@ #include <QDebug> #include <QClipboard> #include <QFileDialog> +#include <QMenu> -#include <LuminaUtils.h> +#include <LUtils.h> #include <LuminaXDG.h> #include "EqValidator.h" |