aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core/lumina-theme-engine
diff options
context:
space:
mode:
authorWeblate <noreply@weblate.org>2017-08-02 20:08:56 +0000
committerWeblate <noreply@weblate.org>2017-08-02 20:08:56 +0000
commit34a16e681691161c3559a254122b2f46c7051a2a (patch)
tree30aeca0629c7781ac4720b927c8f6da17673318a /src-qt5/core/lumina-theme-engine
parentTranslated using Weblate (Spanish) (diff)
parentAdjust the screensaver restart routine a bit. (diff)
downloadlumina-34a16e681691161c3559a254122b2f46c7051a2a.tar.gz
lumina-34a16e681691161c3559a254122b2f46c7051a2a.tar.bz2
lumina-34a16e681691161c3559a254122b2f46c7051a2a.zip
Merge branch 'master' of github.com:trueos/lumina
Diffstat (limited to 'src-qt5/core/lumina-theme-engine')
-rw-r--r--src-qt5/core/lumina-theme-engine/lthemeengine.pri10
-rw-r--r--src-qt5/core/lumina-theme-engine/lthemeengine.pro8
-rw-r--r--src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro4
3 files changed, 6 insertions, 16 deletions
diff --git a/src-qt5/core/lumina-theme-engine/lthemeengine.pri b/src-qt5/core/lumina-theme-engine/lthemeengine.pri
index be67734b..aa8a58bb 100644
--- a/src-qt5/core/lumina-theme-engine/lthemeengine.pri
+++ b/src-qt5/core/lumina-theme-engine/lthemeengine.pri
@@ -8,18 +8,10 @@ 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
+ PREFIX = /usr/local/
}
isEmpty(PLUGINDIR) {
PLUGINDIR = $$[QT_INSTALL_PLUGINS]
diff --git a/src-qt5/core/lumina-theme-engine/lthemeengine.pro b/src-qt5/core/lumina-theme-engine/lthemeengine.pro
index d8ba709e..e3cb47b1 100644
--- a/src-qt5/core/lumina-theme-engine/lthemeengine.pro
+++ b/src-qt5/core/lumina-theme-engine/lthemeengine.pro
@@ -1,5 +1,7 @@
-QT += core gui
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras network
+QT += core gui widgets x11extras network
+!isEqual (QT_MAJOR_VERSION, 5) {
+ error("Use Qt 5.4.0 or higher.")
+}
QMAKE_DISTCLEAN += -r .build
@@ -11,7 +13,7 @@ desktop.path=$${L_SHAREDIR}/applications/
#Install paths
unix {
isEmpty(PREFIX) {
- PREFIX = /usr
+ PREFIX = /usr/local
}
isEmpty(PLUGINDIR) {
PLUGINDIR = $$[QT_INSTALL_PLUGINS]
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro
index 064c7642..a186cd49 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine-qtplugin/lthemeengine-qtplugin.pro
@@ -19,10 +19,6 @@ SOURCES += \
lthemeengineplatformtheme.cpp \
../lthemeengine/lthemeengine.cpp
-!equals (DISABLE_WIDGETS,1) {
- QT += widgets
-}
-
OTHER_FILES += lthemeengine.json
INCLUDEPATH += ../
bgstack15