From 9d703f9519219b5358a165caa520573ef1f5a43e Mon Sep 17 00:00:00 2001
From: eegorov <egor.y.egorov@gmail.com>
Date: Sun, 8 May 2016 14:14:44 +0600
Subject: [PATCH] Make possible to set a path to the patched Qt and his version
during start qmake v2
Signed-off-by: Egor Y. Egorov <egor.y.egorov@gmail.com> (github: eegorov)
---
Telegram/MetaEmoji.pro | 5 +----
Telegram/MetaLang.pro | 5 +----
Telegram/Packer.pro | 4 +---
Telegram/Telegram.pro | 12 ++++++------
Telegram/qt_static.pri | 20 ++++++++++++++++++++
5 files changed, 29 insertions(+), 17 deletions(-)
create mode 100644 Telegram/qt_static.pri
diff --git a/Telegram/MetaEmoji.pro b/Telegram/MetaEmoji.pro
index e859c30c8..02c5c7080 100644
--- a/Telegram/MetaEmoji.pro
+++ b/Telegram/MetaEmoji.pro
@@ -27,7 +27,4 @@ HEADERS += \
./SourceFiles/_other/memain.h \
./SourceFiles/_other/genemoji.h \
-INCLUDEPATH += ./../../Libraries/QtStatic/qtbase/include/QtGui/5.5.1/QtGui\
- ./../../Libraries/QtStatic/qtbase/include/QtCore/5.5.1/QtCore\
- ./../../Libraries/QtStatic/qtbase/include\
-
+include(qt_static.pri)
diff --git a/Telegram/MetaLang.pro b/Telegram/MetaLang.pro
index 0dfa29a6f..cb60900f8 100644
--- a/Telegram/MetaLang.pro
+++ b/Telegram/MetaLang.pro
@@ -27,7 +27,4 @@ HEADERS += \
./SourceFiles/_other/mlmain.h \
./SourceFiles/_other/genlang.h \
-INCLUDEPATH += ./../../Libraries/QtStatic/qtbase/include/QtGui/5.5.1/QtGui\
- ./../../Libraries/QtStatic/qtbase/include/QtCore/5.5.1/QtCore\
- ./../../Libraries/QtStatic/qtbase/include\
-
+include(qt_static.pri)
diff --git a/Telegram/Packer.pro b/Telegram/Packer.pro
index 32fc691c3..ee5f36f28 100644
--- a/Telegram/Packer.pro
+++ b/Telegram/Packer.pro
@@ -35,8 +35,6 @@ unix {
}
}
-INCLUDEPATH += ./../../Libraries/QtStatic/qtbase/include/QtGui/5.5.1/QtGui\
- ./../../Libraries/QtStatic/qtbase/include/QtCore/5.5.1/QtCore\
- ./../../Libraries/QtStatic/qtbase/include
+include(qt_static.pri)
LIBS += -lcrypto -lssl -lz -llzma
diff --git a/Telegram/Telegram.pro b/Telegram/Telegram.pro
index 7973bc234..e65d45766 100644
--- a/Telegram/Telegram.pro
+++ b/Telegram/Telegram.pro
@@ -356,9 +356,9 @@ CONFIG(debug, debug|release) {
QMAKE_LFLAGS_DEBUG += -g -rdynamic -static-libstdc++
}
-INCLUDEPATH += /usr/local/tdesktop/Qt-5.6.0/include/QtGui/5.6.0/QtGui\
- /usr/local/tdesktop/Qt-5.6.0/include/QtCore/5.6.0/QtCore\
- /usr/local/tdesktop/Qt-5.6.0/include\
+include(qt_static.pri)
+
+INCLUDEPATH += \
/usr/local/include\
/usr/local/include/opus\
./SourceFiles\
@@ -382,9 +382,9 @@ INCLUDEPATH += "/usr/include/dee-1.0"
INCLUDEPATH += "/usr/include/libdbusmenu-glib-0.4"
LIBS += -ldl -llzma -lopenal -lavformat -lavcodec -lswresample -lswscale -lavutil -lopus -lva
-LIBS += /usr/local/tdesktop/Qt-5.6.0/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.a \
- /usr/local/tdesktop/Qt-5.6.0/plugins/platforminputcontexts/libibusplatforminputcontextplugin.a \
- /usr/local/tdesktop/Qt-5.6.0/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.a
+LIBS += $${QT_TDESKTOP_PATH}/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.a \
+ $${QT_TDESKTOP_PATH}/plugins/platforminputcontexts/libibusplatforminputcontextplugin.a \
+ $${QT_TDESKTOP_PATH}/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.a
LIBS += /usr/local/lib/libz.a
LIBS += /usr/local/lib/libxkbcommon.a
LIBS += ./../../../Libraries/breakpad/src/client/linux/libbreakpad_client.a
diff --git a/Telegram/qt_static.pri b/Telegram/qt_static.pri
new file mode 100644
index 000000000..9873c80ad
--- /dev/null
+++ b/Telegram/qt_static.pri
@@ -0,0 +1,20 @@
+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}
+
+}
+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 \
+ $${QT_TDESKTOP_PATH}/include/QtCore/$${QT_TDESKTOP_VERSION}/QtCore \
+ $${QT_TDESKTOP_PATH}/include
+