AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make Qt Edition available to qmake

Browse Source 
Allow .pro, .prf ... files to check the edition (OpenSource,
Evaluation, Preview, Enterprise ...) of the Qt installation.

Change-Id: If2a8e3877d066b225b1777916cef1d23c65f8512
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Kai Koehne 2015-05-21 15:45:44 +02:00
parent fe6eeab561
commit 5d707bff3d
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -6763,6 +6763,8 @@ QT_PATCH_VERSION = $QT_PATCH_VERSION
QT_LIBINFIX = $QT_LIBINFIX QT_LIBINFIX = $QT_LIBINFIX
QT_NAMESPACE = $QT_NAMESPACE QT_NAMESPACE = $QT_NAMESPACE
QT_EDITION = $Edition
EOF EOF
if [ "$CFG_SHARED" = "no" ]; then if [ "$CFG_SHARED" = "no" ]; then

3
tools/configure/configureapp.cpp
View File

@ -3460,6 +3460,9 @@ void Configure::generateQConfigPri()
<< "QT_MINOR_VERSION = " << dictionary["VERSION_MINOR"] << endl << "QT_MINOR_VERSION = " << dictionary["VERSION_MINOR"] << endl
<< "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl; << "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl;
configStream << endl
<< "QT_EDITION = " << dictionary["EDITION"] << endl;
if (!dictionary["CFG_SYSROOT"].isEmpty() && dictionary["CFG_GCC_SYSROOT"] == "yes") { if (!dictionary["CFG_SYSROOT"].isEmpty() && dictionary["CFG_GCC_SYSROOT"] == "yes") {
configStream << endl configStream << endl
<< "# sysroot" << endl << "# sysroot" << endl