diff options
| author | Weblate <noreply@weblate.org> | 2017-12-15 22:52:34 +0000 |
|---|---|---|
| committer | Weblate <noreply@weblate.org> | 2017-12-15 22:52:34 +0000 |
| commit | 9155556b94b0fe25ef3d5398a7f70dcdc1841d69 (patch) | |
| tree | ae5af06e4741c8767344be6d90a7307bcddb5b5d /src-qt5/OS-detect.pri | |
| parent | Translated using Weblate (Russian) (diff) | |
| parent | Another minor networking fix. (diff) | |
| download | lumina-9155556b94b0fe25ef3d5398a7f70dcdc1841d69.tar.gz lumina-9155556b94b0fe25ef3d5398a7f70dcdc1841d69.tar.bz2 lumina-9155556b94b0fe25ef3d5398a7f70dcdc1841d69.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/OS-detect.pri')
| -rw-r--r-- | src-qt5/OS-detect.pri | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src-qt5/OS-detect.pri b/src-qt5/OS-detect.pri index 8b7b0bc0..f7c65d6f 100644 --- a/src-qt5/OS-detect.pri +++ b/src-qt5/OS-detect.pri @@ -23,7 +23,7 @@ # ============================================= isEmpty(OS){ message("Build OS Info: $${QMAKE_HOST.os}, $${QMAKE_HOST.arch}, $${QMAKE_HOST.version_string}") - + message(" - Detected Qt Version: $${QT_VERSION}") #Load the initial library/includefile search locations (more can be added in the OS-specific sections below) LIBS = -L$${PWD}/core/libLumina -L$$[QT_INSTALL_LIBS] INCLUDEPATH = $${PWD}/core/libLumina $$[QT_INSTALL_HEADERS] $$[QT_INSTALL_PREFIX] @@ -75,12 +75,12 @@ isEmpty(OS){ #Apply any special rules for particular distros equals(LINUX_DISTRO,"Fedora"){ isEmpty(L_ETCDIR){ L_ETCDIR=/etc } - } + } equals(LINUX_DISTRO,"Gentoo"){ isEmpty(L_BINDIR){ L_BINDIR = $${PREFIX}/bin } isEmpty(L_ETCDIR){ L_ETCDIR = $${PREFIX}/../etc } isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man } - } + } }else{ OS="Unknown"; } @@ -126,4 +126,7 @@ isEmpty(OS){ OBJECTS_DIR=./.build/obj RCC_DIR=./.build/rcc QMAKE_DISTCLEAN += -r ./.build + + #some other compile time flags + CONFIG *= c++11 } |