diff options
author | q5sys <jt@obs-sec.com> | 2017-07-18 16:30:58 -0400 |
---|---|---|
committer | q5sys <jt@obs-sec.com> | 2017-07-18 16:30:58 -0400 |
commit | e8ce26568f0894b5674c9aeb5e7798aeb0e26543 (patch) | |
tree | 9b795ec9e3bea7d5bfb47c32781cf92bd7160dd0 | |
parent | source directory updates (diff) | |
download | lumina-e8ce26568f0894b5674c9aeb5e7798aeb0e26543.tar.gz lumina-e8ce26568f0894b5674c9aeb5e7798aeb0e26543.tar.bz2 lumina-e8ce26568f0894b5674c9aeb5e7798aeb0e26543.zip |
the changing of the names
26 files changed, 88 insertions, 88 deletions
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/qt5ct-qtplugin.pro b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro index 9dd3eae4..1b9bd682 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/qt5ct-qtplugin.pro +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro @@ -1,7 +1,7 @@ -include(../../qt5ct.pri) +include(../../lthemeengine.pri) TEMPLATE = lib -TARGET = qt5ct +TARGET = lthemeengine CONFIG += plugin greaterThan(QT_MINOR_VERSION, 7) { @@ -16,20 +16,20 @@ greaterThan(QT_MINOR_VERSION, 7) { SOURCES += \ main.cpp \ - qt5ctplatformtheme.cpp \ - ../qt5ct/qt5ct.cpp + lthemeengineplatformtheme.cpp \ + ../lthemeengine/qt5ct.cpp !equals (DISABLE_WIDGETS,1) { QT += widgets } -OTHER_FILES += qt5ct.json +OTHER_FILES += lthemeengine.json INCLUDEPATH += ../ HEADERS += \ - qt5ctplatformtheme.h \ - ../qt5ct/qt5ct.h + lthemeengineplatformtheme.h \ + ../lthemeengine/qt5ct.h target.path = $$PLUGINDIR/platformthemes INSTALLS += target diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine.json b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine.json new file mode 100644 index 00000000..433d4a88 --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "lthemeengine" ] +} diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/qt5ctplatformtheme.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp index 4c20d68f..ab0642dc 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/qt5ctplatformtheme.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.cpp @@ -44,8 +44,8 @@ #include <QFile> #include <QFileSystemWatcher> -#include <qt5ct/qt5ct.h> -#include "qt5ctplatformtheme.h" +#include <lthemeengine/qt5ct.h> +#include "lthemeengineplatformtheme.h" #if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) && !defined(QT_NO_DBUS) #include <private/qdbusmenubar_p.h> #endif @@ -56,9 +56,9 @@ -Q_LOGGING_CATEGORY(lqt5ct, "qt5ct") +Q_LOGGING_CATEGORY(llthemeengine, "qt5ct") -//QT_QPA_PLATFORMTHEME=qt5ct +//QT_QPA_PLATFORMTHEME=lthemeengine Qt5CTPlatformTheme::Qt5CTPlatformTheme() { @@ -71,10 +71,10 @@ Qt5CTPlatformTheme::Qt5CTPlatformTheme() #endif QGuiApplication::setFont(m_generalFont); } - qCDebug(lqt5ct) << "using qt5ct plugin"; + qCDebug(llthemeengine) << "using qt5ct plugin"; #ifdef QT_WIDGETS_LIB - if(!QStyleFactory::keys().contains("qt5ct-style")) - qCCritical(lqt5ct) << "unable to find qt5ct proxy style"; + if(!QStyleFactory::keys().contains("lthemeengine-style")) + qCCritical(llthemeengine) << "unable to find qt5ct proxy style"; #endif } @@ -91,7 +91,7 @@ QPlatformMenuBar *Qt5CTPlatformTheme::createPlatformMenuBar() const { QDBusConnection conn = QDBusConnection::sessionBus(); m_dbusGlobalMenuAvailable = conn.interface()->isServiceRegistered("com.canonical.AppMenu.Registrar"); - qCDebug(lqt5ct) << "D-Bus global menu:" << (m_dbusGlobalMenuAvailable ? "yes" : "no"); + qCDebug(llthemeengine) << "D-Bus global menu:" << (m_dbusGlobalMenuAvailable ? "yes" : "no"); } return (m_dbusGlobalMenuAvailable ? new QDBusMenuBar() : nullptr); } @@ -105,7 +105,7 @@ QPlatformSystemTrayIcon *Qt5CTPlatformTheme::createPlatformSystemTrayIcon() cons QDBusMenuConnection conn; m_dbusTrayAvailable = conn.isStatusNotifierHostRegistered(); m_checkDBusTray = false; - qCDebug(lqt5ct) << "D-Bus system tray:" << (m_dbusTrayAvailable ? "yes" : "no"); + qCDebug(llthemeengine) << "D-Bus system tray:" << (m_dbusTrayAvailable ? "yes" : "no"); } return (m_dbusTrayAvailable ? new QDBusTrayIcon() : nullptr); } @@ -137,7 +137,7 @@ QVariant Qt5CTPlatformTheme::themeHint(QPlatformTheme::ThemeHint hint) const case QPlatformTheme::SystemIconThemeName: return m_iconTheme; case QPlatformTheme::StyleNames: - return QStringList() << "qt5ct-style"; + return QStringList() << "lthemeengine-style"; case QPlatformTheme::IconThemeSearchPaths: return Qt5CT::iconPaths(); case DialogButtonBoxLayout: @@ -165,7 +165,7 @@ void Qt5CTPlatformTheme::applySettings() if(QCoreApplication::testAttribute(Qt::AA_SetPalette)) { m_usePalette = false; - qCDebug(lqt5ct) << "palette support is disabled"; + qCDebug(llthemeengine) << "palette support is disabled"; } } #endif @@ -184,8 +184,8 @@ void Qt5CTPlatformTheme::applySettings() qApp->setWheelScrollLines(m_wheelScrollLines); #endif - if(m_update && qApp->style()->objectName() == "qt5ct-style") //ignore application style - qApp->setStyle("qt5ct-style"); //recreate style object + if(m_update && qApp->style()->objectName() == "lthemeengine-style") //ignore application style + qApp->setStyle("lthemeengine-style"); //recreate style object if(m_update && m_usePalette) { @@ -199,7 +199,7 @@ void Qt5CTPlatformTheme::applySettings() if(m_prevStyleSheet == qApp->styleSheet()) qApp->setStyleSheet(m_userStyleSheet); else - qCDebug(lqt5ct) << "custom style sheet is disabled"; + qCDebug(llthemeengine) << "custom style sheet is disabled"; m_prevStyleSheet = m_userStyleSheet; } #endif @@ -238,7 +238,7 @@ void Qt5CTPlatformTheme::createFSWatcher() void Qt5CTPlatformTheme::updateSettings() { - qCDebug(lqt5ct) << "updating settings.."; + qCDebug(llthemeengine) << "updating settings.."; readSettings(); applySettings(); } diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/qt5ctplatformtheme.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.h index 8eb3cf6a..5ff96844 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/qt5ctplatformtheme.h +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengineplatformtheme.h @@ -117,6 +117,6 @@ private: }; -Q_DECLARE_LOGGING_CATEGORY(lqt5ct) +Q_DECLARE_LOGGING_CATEGORY(llthemeengine) #endif // QT5CTPLATFORMTHEME_H diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/main.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/main.cpp index e49004d8..e97db782 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/main.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/main.cpp @@ -27,14 +27,14 @@ */ #include <qpa/qplatformthemeplugin.h> -#include "qt5ctplatformtheme.h" +#include "lthemeengineplatformtheme.h" QT_BEGIN_NAMESPACE class Qt5CTPlatformThemePlugin: public QPlatformThemePlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformThemeFactoryInterface.5.1" FILE "qt5ct.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformThemeFactoryInterface.5.1" FILE "lthemeengine.json") public: QPlatformTheme *create(const QString &key, const QStringList ¶ms); }; @@ -42,7 +42,7 @@ public: QPlatformTheme *Qt5CTPlatformThemePlugin::create(const QString &key, const QStringList ¶ms) { Q_UNUSED(params); - if (key.toLower() == "qt5ct") + if (key.toLower() == "lthemeengine") return new Qt5CTPlatformTheme(); return NULL; } diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/qt5ct.json b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/qt5ct.json deleted file mode 100644 index 55466151..00000000 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/qt5ct.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Keys": [ "qt5ct" ] -} diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine-style.pro b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine-style.pro new file mode 100644 index 00000000..f8584138 --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine-style.pro @@ -0,0 +1,26 @@ +include(../../lthemeengine.pri) + +TEMPLATE = lib +TARGET = lthemeengine-style +QT += widgets + +# Input + +CONFIG += plugin + +target.path = $$PLUGINDIR/styles +INSTALLS += target + +INCLUDEPATH += ../ + +HEADERS += \ + lthemeengineproxystyle.h \ + ../lthemeengine/qt5ct.h + +SOURCES += \ + plugin.cpp \ + lthemeengineproxystyle.cpp \ + ../lthemeengine/qt5ct.cpp + +OTHER_FILES += \ + lthemeengine.json diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine.json b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine.json new file mode 100644 index 00000000..e8aae055 --- /dev/null +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengine.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "lthemeengine-style" ] +} diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/qt5ctproxystyle.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.cpp index f3b33d5e..8e72aff2 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/qt5ctproxystyle.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.cpp @@ -27,8 +27,8 @@ */ #include <QSettings> -#include <qt5ct/qt5ct.h> -#include "qt5ctproxystyle.h" +#include <lthemeengine/qt5ct.h> +#include "lthemeengineproxystyle.h" Qt5CTProxyStyle::Qt5CTProxyStyle(const QString &key) : QProxyStyle(key) diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/qt5ctproxystyle.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.h index 842247cf..842247cf 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/qt5ctproxystyle.h +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/lthemeengineproxystyle.h diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/plugin.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/plugin.cpp index 345746f3..35ff6477 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/plugin.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/plugin.cpp @@ -29,13 +29,13 @@ #include <QStylePlugin> #include <QSettings> #include <QStyleFactory> -#include <qt5ct/qt5ct.h> -#include "qt5ctproxystyle.h" +#include <lthemeengine/qt5ct.h> +#include "lthemeengineproxystyle.h" class Qt5CTStylePlugin : public QStylePlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QStyleFactoryInterface" FILE "qt5ct.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QStyleFactoryInterface" FILE "lthemeengine.json") public: QStyle *create(const QString &key); @@ -43,7 +43,7 @@ public: QStyle *Qt5CTStylePlugin::create(const QString &key) { - if (key == "qt5ct-style") + if (key == "lthemeengine-style") { QSettings settings(Qt5CT::configFile(), QSettings::IniFormat); QString style = settings.value("Appearance/style", "Fusion").toString(); diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/qt5ct-style.pro b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/qt5ct-style.pro deleted file mode 100644 index e6f6dc1c..00000000 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/qt5ct-style.pro +++ /dev/null @@ -1,26 +0,0 @@ -include(../../qt5ct.pri) - -TEMPLATE = lib -TARGET = qt5ct-style -QT += widgets - -# Input - -CONFIG += plugin - -target.path = $$PLUGINDIR/styles -INSTALLS += target - -INCLUDEPATH += ../ - -HEADERS += \ - qt5ctproxystyle.h \ - ../qt5ct/qt5ct.h - -SOURCES += \ - plugin.cpp \ - qt5ctproxystyle.cpp \ - ../qt5ct/qt5ct.cpp - -OTHER_FILES += \ - qt5ct.json diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/qt5ct.json b/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/qt5ct.json deleted file mode 100644 index 3c42f2d3..00000000 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-style/qt5ct.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Keys": [ "qt5ct-style" ] -} diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp index 4183dec1..13dcc395 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/appearancepage.cpp @@ -34,7 +34,7 @@ #include <QMessageBox> #include <QMenu> #include <QIcon> -#include "qt5ct.h" +#include "lthemeengine.h" #include "appearancepage.h" #include "paletteeditdialog.h" #include "ui_appearancepage.h" @@ -46,7 +46,7 @@ AppearancePage::AppearancePage(QWidget *parent) : { m_ui->setupUi(this); QStringList keys = QStyleFactory::keys(); - keys.removeAll("qt5ct-style"); //hide qt5ct proxy style + keys.removeAll("lthemeengine-style"); //hide lthemeengine proxy style m_ui->styleComboBox->addItems(keys); connect(m_ui->paletteComboBox, SIGNAL(activated(int)), SLOT(updatePalette())); diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/fontspage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/fontspage.cpp index ac9fb164..bc8a4ee0 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/fontspage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/fontspage.cpp @@ -33,7 +33,7 @@ #include <QFontDialog> #include <QDir> #include <QFile> -#include "qt5ct.h" +#include "lthemeengine.h" #include "fontspage.h" #include "fontconfigdialog.h" #include "ui_fontspage.h" diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/iconthemepage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/iconthemepage.cpp index ee4d638d..d96c485c 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/iconthemepage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/iconthemepage.cpp @@ -33,7 +33,7 @@ #include <QTreeWidgetItem> #include <QImageReader> #include <QLocale> -#include "qt5ct.h" +#include "lthemeengine.h" #include "iconthemepage.h" #include "ui_iconthemepage.h" diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp index fc5c0662..fe953e78 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/interfacepage.cpp @@ -29,7 +29,7 @@ #include <QSettings> #include <QApplication> #include <QDialogButtonBox> -#include "qt5ct.h" +#include "lthemeengine.h" #include "interfacepage.h" #include "ui_interfacepage.h" diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qt5ct.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemengine.cpp index b83f43df..ed3c909e 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qt5ct.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemengine.cpp @@ -28,7 +28,7 @@ #include <QDir> #include <QLocale> -#include "qt5ct.h" +#include "lthemeengine.h" #ifndef QT5CT_DATADIR #define QT5CT_DATADIR "/usr/share" @@ -37,12 +37,12 @@ QString Qt5CT::configPath() { - return QDir::homePath() + "/.config/qt5ct/"; + return QDir::homePath() + "/.config/lthemeengine/"; } QString Qt5CT::configFile() { - return configPath() + "qt5ct.conf"; + return configPath() + "lthemeengine.conf"; } QStringList Qt5CT::iconPaths() @@ -87,7 +87,7 @@ QString Qt5CT::userStyleSheetPath() QString Qt5CT::sharedStyleSheetPath() { - return QT5CT_DATADIR"/qt5ct/qss/"; + return QT5CT_DATADIR"/lthemeengine/qss/"; } QString Qt5CT::userColorSchemePath() @@ -97,7 +97,7 @@ QString Qt5CT::userColorSchemePath() QString Qt5CT::sharedColorSchemePath() { - return QT5CT_DATADIR"/qt5ct/colors/"; + return QT5CT_DATADIR"/lthemeengine/colors/"; } QString Qt5CT::systemLanguageID() diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qt5ct.desktop b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemengine.desktop index 1c5f6560..be2bde14 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qt5ct.desktop +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemengine.desktop @@ -53,7 +53,7 @@ Comment[zh_TW]=Qt5 設定工具 Name[zh_TW]=Qt5 設定 -Exec=qt5ct +Exec=lthemeengine Icon=preferences-desktop-theme Terminal=false Type=Application diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qt5ct.h b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemengine.h index 1aecd741..1aecd741 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qt5ct.h +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemengine.h diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qt5ct.pro b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemengine.pro index 0f9724f1..07677fe3 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qt5ct.pro +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemengine.pro @@ -1,4 +1,4 @@ -include(../../qt5ct.pri) +include(../../lthemeengine.pri) TEMPLATE = app @@ -10,7 +10,7 @@ SOURCES += \ tabpage.cpp \ appearancepage.cpp \ fontspage.cpp \ - qt5ct.cpp \ + lthemeengine.cpp \ paletteeditdialog.cpp \ iconthemepage.cpp \ interfacepage.cpp \ @@ -35,7 +35,7 @@ HEADERS += \ tabpage.h \ appearancepage.h \ fontspage.h \ - qt5ct.h \ + lthemeengine.h \ paletteeditdialog.h \ iconthemepage.h \ interfacepage.h \ @@ -51,7 +51,7 @@ RESOURCES = translations/translations.qrc target.path = $$BINDIR -desktop.files = qt5ct.desktop +desktop.files = lthemeengine.desktop desktop.path = $$DATADIR/applications INSTALLS += target desktop diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp index d15c9c01..f4a14222 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/main.cpp @@ -29,7 +29,7 @@ #include <QApplication> #include <QLibraryInfo> #include <QLocale> -#include "qt5ct.h" +#include "lthemeengine.h" #include <QTranslator> #include <QMessageBox> #include <QProcessEnvironment> @@ -41,7 +41,7 @@ int main(int argc, char **argv) QApplication app(argc, argv); QTranslator translator; QString locale = Qt5CT::systemLanguageID(); - translator.load(QString(":/qt5ct_") + locale); + translator.load(QString(":/lthemeengine_") + locale); app.installTranslator(&translator); QTranslator qt_translator; @@ -60,15 +60,15 @@ int main(int argc, char **argv) errorMessages << app.translate("main", "Please remove the <b>QT_STYLE_OVERRIDE</b> environment variable"); } - if(env.value("QT_QPA_PLATFORMTHEME") != "qt5ct") + if(env.value("QT_QPA_PLATFORMTHEME") != "lthemeengine") { errorMessages << app.translate("main", "The <b>QT_QPA_PLATFORMTHEME</b> environment " "variable is not set correctly"); } - if(!QStyleFactory::keys().contains("qt5ct-style")) + if(!QStyleFactory::keys().contains("lthemeengine-style")) { - errorMessages << app.translate("main", "Unable to find <b>libqt5ct-style.so</b>"); + errorMessages << app.translate("main", "Unable to find <b>liblthemeengine-style.so</b>"); } if(!errorMessages.isEmpty()) diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp index b120436f..ce3bd6b8 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/mainwindow.cpp @@ -28,7 +28,7 @@ #include <QApplication> #include <QSettings> -#include "qt5ct.h" +#include "lthemeengine.h" #include "mainwindow.h" #include "appearancepage.h" #include "fontspage.h" diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp index 31a3a2a9..f297b55c 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/paletteeditdialog.cpp @@ -29,7 +29,7 @@ #include <QPalette> #include <QColorDialog> #include <QSettings> -#include "qt5ct.h" +#include "lthemeengine.h" #include "paletteeditdialog.h" #include "ui_paletteeditdialog.h" diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp index 7c6292ac..fbe52cf9 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsseditordialog.cpp @@ -28,7 +28,7 @@ #include <QFile> #include <QSettings> -#include "qt5ct.h" +#include "lthemeengine.h" #include "qsseditordialog.h" #include "ui_qsseditordialog.h" diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp index 784ff674..f2f05ae9 100644 --- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp +++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp @@ -32,7 +32,7 @@ #include <QMessageBox> #include <QFile> #include <QMenu> -#include "qt5ct.h" +#include "lthemeengine.h" #include "qsseditordialog.h" #include "qsspage.h" #include "ui_qsspage.h" |