diff options
-rw-r--r-- | src-qt5/core/lumina-theme-engine/lthemeengine.pri | 32 | ||||
-rw-r--r-- | src-qt5/core/lumina-theme-engine/lthemeengine.pro (renamed from src-qt5/core/lumina-theme-engine/lumina-theme-engine.pro) | 2 | ||||
-rw-r--r-- | src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp | 4 | ||||
-rw-r--r-- | src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.cpp | 4 | ||||
-rw-r--r-- | src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.h | 6 | ||||
-rw-r--r-- | src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.pro | 2 |
6 files changed, 40 insertions, 10 deletions
diff --git a/src-qt5/core/lumina-theme-engine/lthemeengine.pri b/src-qt5/core/lumina-theme-engine/lthemeengine.pri new file mode 100644 index 00000000..be67734b --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/lthemeengine.pri @@ -0,0 +1,32 @@ +#Some conf to redirect intermediate stuff in separate dirs +UI_DIR=./.build/ui/ +MOC_DIR=./.build/moc/ +OBJECTS_DIR=./.build/obj +RCC_DIR=./.build/rcc + +QMAKE_DISTCLEAN += -r .build + +CONFIG += c++11 + +!isEqual (QT_MAJOR_VERSION, 5) { + error("Use Qt 5.4.0 or higher.") +} + +!greaterThan(QT_MINOR_VERSION, 3) { + error("Use Qt 5.4.0 or higher.") +} + +#Install paths +unix { + isEmpty(PREFIX) { + PREFIX = /usr + } + isEmpty(PLUGINDIR) { + PLUGINDIR = $$[QT_INSTALL_PLUGINS] + } + + BINDIR = $$PREFIX/bin + DATADIR = $$PREFIX/share + + DEFINES += LTHEMEENGINE_DATADIR=\\\"$$DATADIR\\\" +} diff --git a/src-qt5/core/lumina-theme-engine/lumina-theme-engine.pro b/src-qt5/core/lumina-theme-engine/lthemeengine.pro index 891d3a44..2b2b34b0 100644 --- a/src-qt5/core/lumina-theme-engine/lumina-theme-engine.pro +++ b/src-qt5/core/lumina-theme-engine/lthemeengine.pro @@ -22,7 +22,7 @@ message(Found lrelease executable: $$LRELEASE_EXECUTABLE) message(generating translations) unix:system(find . -name *.ts | xargs $$LRELEASE_EXECUTABLE) -include(lumina-theme-engine.pri) +include(lthemeengine.pri) message (PREFIX=$$PREFIX) message (BINDIR=$$BINDIR) diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp index 0b0403a4..02f6a10f 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp @@ -60,7 +60,7 @@ Q_LOGGING_CATEGORY(llthemeengine, "lthemeengine") //QT_QPA_PLATFORMTHEME=lthemeengine -lthemeenginePlatformTheme::Qt5CTPlatformTheme() +lthemeenginePlatformTheme::lthemeenginePlatformTheme() { if(QGuiApplication::desktopSettingsAware()) { @@ -78,7 +78,7 @@ lthemeenginePlatformTheme::Qt5CTPlatformTheme() #endif } -lthemeenginePlatformTheme::~Qt5CTPlatformTheme() +lthemeenginePlatformTheme::~lthemeenginePlatformTheme() { if(m_customPalette) delete m_customPalette; diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.cpp index 23ad01ef..c9833a30 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.cpp @@ -30,7 +30,7 @@ #include <lthemeengine/lthemeengine.h> #include "lthemeengineproxystyle.h" -lthemeengineProxyStyle::Qt5CTProxyStyle(const QString &key) : +lthemeengineProxyStyle::lthemeengineProxyStyle(const QString &key) : QProxyStyle(key) { QSettings settings(lthemeengine::configFile(), QSettings::IniFormat); @@ -38,7 +38,7 @@ lthemeengineProxyStyle::Qt5CTProxyStyle(const QString &key) : m_activateItemOnSingleClick = settings.value("Interface/activate_item_on_single_click", Qt::PartiallyChecked).toInt(); } -lthemeengineProxyStyle::~Qt5CTProxyStyle() +lthemeengineProxyStyle::~lthemeengineProxyStyle() { //qDebug("%s", Q_FUNC_INFO); } diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.h index 1eb33cdf..7493b39c 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.h +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.h @@ -33,10 +33,10 @@ #define LTHEMEENGINE_VERSION_MINOR 33 #define LTHEMEENGINE_TOSTRING(s) #s -#define LTHEMEENGINE_STRINGIFY(s) QT5CT_TOSTRING(s) +#define LTHEMEENGINE_STRINGIFY(s) LTHEMEENGINE_TOSTRING(s) -#define LTHEMEENGINE_VERSION_INT (QT5CT_VERSION_MAJOR<<8 | QT5CT_VERSION_MINOR) -#define LTHEMEENGINE_VERSION_STR QT5CT_STRINGIFY(QT5CT_VERSION_MAJOR.QT5CT_VERSION_MINOR) +#define LTHEMEENGINE_VERSION_INT (LTHEMEENGINE_VERSION_MAJOR<<8 | QT5CT_VERSION_MINOR) +#define LTHEMEENGINE_VERSION_STR LTHEMEENGINE_STRINGIFY(QT5CT_VERSION_MAJOR.QT5CT_VERSION_MINOR) #include <QString> #include <QStringList> diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.pro b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.pro index 07677fe3..cc36ee5b 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.pro +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.pro @@ -47,8 +47,6 @@ HEADERS += \ DEFINES += USE_WIDGETS } -RESOURCES = translations/translations.qrc - target.path = $$BINDIR desktop.files = lthemeengine.desktop |