diff options
| author | q5sys <jt@obs-sec.com> | 2017-07-18 17:15:43 -0400 |
|---|---|---|
| committer | q5sys <jt@obs-sec.com> | 2017-07-18 17:15:43 -0400 |
| commit | 79b63889ab31ac2649ee21e127189ef5918542ca (patch) | |
| tree | e45f5b0b259252b080823790cf383ce59393a3b0 /src-qt5/core/lumina-theme-engine/src | |
| parent | the second great renaming (diff) | |
| download | lumina-79b63889ab31ac2649ee21e127189ef5918542ca.tar.gz lumina-79b63889ab31ac2649ee21e127189ef5918542ca.tar.bz2 lumina-79b63889ab31ac2649ee21e127189ef5918542ca.zip | |
get lthemeengine building successfully
Diffstat (limited to 'src-qt5/core/lumina-theme-engine/src')
4 files changed, 7 insertions, 9 deletions
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 |