From 267f61917508be7425e3e74ba85c197bb0419fe7 Mon Sep 17 00:00:00 2001 From: Kirill Date: Wed, 6 Jul 2016 00:39:46 +0600 Subject: [PATCH] Add option to set Qt path and version as env variables. Signed-off-by: Kirill Leyfer (github: BOOtak) --- Telegram/qt_static.pri | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Telegram/qt_static.pri b/Telegram/qt_static.pri index 9873c80ad..18531c4b7 100644 --- a/Telegram/qt_static.pri +++ b/Telegram/qt_static.pri @@ -1,17 +1,22 @@ QT_TDESKTOP_VERSION_DEFAULT = 5.6.0 QT_TDESKTOP_PATH_DEFAULT = /usr/local/tdesktop/Qt-$${QT_TDESKTOP_VERSION_DEFAULT} -QT_TDESKTOP_VERSION = $${QT_TDESKTOP_VERSION} QT_TDESKTOP_PATH = $${QT_TDESKTOP_PATH} - isEmpty(QT_TDESKTOP_PATH) { - message(QT_TDESKTOP_PATH is not set. Using default value $${QT_TDESKTOP_PATH_DEFAULT}) - QT_TDESKTOP_PATH = $${QT_TDESKTOP_PATH_DEFAULT} - + QT_TDESKTOP_PATH = $$(QT_TDESKTOP_PATH) + isEmpty(QT_TDESKTOP_PATH) { + message(QT_TDESKTOP_PATH is not set. Using default value $${QT_TDESKTOP_PATH_DEFAULT}) + QT_TDESKTOP_PATH = $${QT_TDESKTOP_PATH_DEFAULT} + } } + +QT_TDESKTOP_VERSION = $${QT_TDESKTOP_VERSION} isEmpty(QT_TDESKTOP_VERSION) { - message(QT_TDESKTOP_VERSION is not set. Using default value $${QT_TDESKTOP_VERSION_DEFAULT}) - QT_TDESKTOP_VERSION = $${QT_TDESKTOP_VERSION_DEFAULT} + QT_TDESKTOP_VERSION = $$(QT_TDESKTOP_VERSION) + isEmpty(QT_TDESKTOP_VERSION) { + message(QT_TDESKTOP_VERSION is not set. Using default value $${QT_TDESKTOP_VERSION_DEFAULT}) + QT_TDESKTOP_VERSION = $${QT_TDESKTOP_VERSION_DEFAULT} + } } INCLUDEPATH += $${QT_TDESKTOP_PATH}/include/QtGui/$${QT_TDESKTOP_VERSION}/QtGui \