diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-05-21 15:45:44 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-05-27 10:23:04 +0000 |
| commit | 5d707bff3d2b01532ccfc429096e3fd34988e619 (patch) | |
| tree | 288612ca15f15fcf95b12390908ad959407d4270 | |
| parent | fe6eeab5618d9f42929872faff94dacdc0890fd2 (diff) | |
Make Qt Edition available to qmake
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>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 |
2 files changed, 5 insertions, 0 deletions
@@ -6763,6 +6763,8 @@ QT_PATCH_VERSION = $QT_PATCH_VERSION QT_LIBINFIX = $QT_LIBINFIX QT_NAMESPACE = $QT_NAMESPACE +QT_EDITION = $Edition + EOF if [ "$CFG_SHARED" = "no" ]; then diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 08ec943563..4d1ce3d113 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3460,6 +3460,9 @@ void Configure::generateQConfigPri() << "QT_MINOR_VERSION = " << dictionary["VERSION_MINOR"] << 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") { configStream << endl << "# sysroot" << endl |