diff options
| author | Christopher Roy Bratusek <nano@jpberlin.de> | 2015-01-07 19:55:35 +0100 |
|---|---|---|
| committer | Ken Moore <ken@pcbsd.org> | 2015-01-08 08:10:35 -0500 |
| commit | c20cce2b356c8c689c71824308d78321e65f8854 (patch) | |
| tree | 5f3627ffef6a9aeb1ecaf31b0532706654c06e49 | |
| parent | debian: lumina qt5/0.8.0 updates (diff) | |
| download | lumina-c20cce2b356c8c689c71824308d78321e65f8854.tar.gz lumina-c20cce2b356c8c689c71824308d78321e65f8854.tar.bz2 lumina-c20cce2b356c8c689c71824308d78321e65f8854.zip | |
use QT5LIBDIR in all qmake files
| -rw-r--r-- | lumina-config/lumina-config.pro | 7 | ||||
| -rw-r--r-- | lumina-desktop/lumina-desktop.pro | 7 | ||||
| -rw-r--r-- | lumina-fm/lumina-fm.pro | 6 | ||||
| -rw-r--r-- | lumina-open/lumina-open.pro | 7 | ||||
| -rw-r--r-- | lumina-screenshot/lumina-screenshot.pro | 5 | ||||
| -rw-r--r-- | lumina-search/lumina-search.pro | 6 |
6 files changed, 28 insertions, 10 deletions
diff --git a/lumina-config/lumina-config.pro b/lumina-config/lumina-config.pro index ba2e96cf..2ddce0ed 100644 --- a/lumina-config/lumina-config.pro +++ b/lumina-config/lumina-config.pro @@ -40,7 +40,12 @@ INCLUDEPATH += ../libLumina $$PREFIX/include LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -LRELEASE = $$LIBPREFIX/qt5/bin/lrelease +isEmpty(QT5LIBDIR) { + QT5LIBDIR = $$PREFIX/lib/qt5 +} + +LRELEASE = $$QT5LIBDIR/bin/lrelease + QMAKE_LIBDIR = ../libLumina DEPENDPATH += ../libLumina diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro index 5258eca3..2d2085fc 100644 --- a/lumina-desktop/lumina-desktop.pro +++ b/lumina-desktop/lumina-desktop.pro @@ -18,7 +18,12 @@ DEPENDPATH += ../libLumina TEMPLATE = app -LRELEASE = $$LIBPREFIX/qt5/bin/lrelease +isEmpty(QT5LIBDIR) { + QT5LIBDIR = $$PREFIX/lib/qt5 +} + +LRELEASE = $$QT5LIBDIR/bin/lrelease + SOURCES += main.cpp \ WMProcess.cpp \ diff --git a/lumina-fm/lumina-fm.pro b/lumina-fm/lumina-fm.pro index ad6b9a2f..8809a2b7 100644 --- a/lumina-fm/lumina-fm.pro +++ b/lumina-fm/lumina-fm.pro @@ -40,11 +40,7 @@ INCLUDEPATH += ../libLumina $$PREFIX/include LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -openbsd-g++4 { - LRELEASE = lrelease4 -} else { - LRELEASE = $$QT5LIBDIR/bin/lrelease -} +LRELEASE = $$QT5LIBDIR/bin/lrelease QMAKE_LIBDIR = ../libLumina DEPENDPATH += ../libLumina diff --git a/lumina-open/lumina-open.pro b/lumina-open/lumina-open.pro index 37f55e32..ade86be1 100644 --- a/lumina-open/lumina-open.pro +++ b/lumina-open/lumina-open.pro @@ -28,7 +28,12 @@ LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils QMAKE_LIBDIR = ../libLumina DEPENDPATH += ../libLumina -LRELEASE = $$LIBPREFIX/qt5/bin/lrelease +isEmpty(QT5LIBDIR) { + QT5LIBDIR = $$PREFIX/lib/qt5 +} + +LRELEASE = $$QT5LIBDIR/bin/lrelease + TRANSLATIONS = i18n/lumina-open_af.ts \ i18n/lumina-open_ar.ts \ diff --git a/lumina-screenshot/lumina-screenshot.pro b/lumina-screenshot/lumina-screenshot.pro index ed1979bf..fd3609f3 100644 --- a/lumina-screenshot/lumina-screenshot.pro +++ b/lumina-screenshot/lumina-screenshot.pro @@ -25,8 +25,11 @@ INCLUDEPATH += ../libLumina $$PREFIX/include LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -LRELEASE = $$LIBPREFIX/qt5/bin/lrelease +isEmpty(QT5LIBDIR) { + QT5LIBDIR = $$PREFIX/lib/qt5 +} +LRELEASE = $$QT5LIBDIR/bin/lrelease QMAKE_LIBDIR = ../libLumina DEPENDPATH += ../libLumina diff --git a/lumina-search/lumina-search.pro b/lumina-search/lumina-search.pro index 410592d3..f81b4b4f 100644 --- a/lumina-search/lumina-search.pro +++ b/lumina-search/lumina-search.pro @@ -27,7 +27,11 @@ INCLUDEPATH += ../libLumina $$PREFIX/include LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -LRELEASE = $$LIBPREFIX/qt5/bin/lrelease +isEmpty(QT5LIBDIR) { + QT5LIBDIR = $$PREFIX/lib/qt5 +} + +LRELEASE = $$QT5LIBDIR/bin/lrelease QMAKE_LIBDIR = ../libLumina |