Changeset 1050 for trunk/src/qbase.pri

Timestamp:

Sep 5, 2011, 5:03:54 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

Restore place of original VERSION definition (revert r385).

The reason is that VERSION is very dangerous: setting it causes all DLL
files to get the suffix comprised of the major version number extracted from
the VERSION's value. Since qt_targets.pri may be included everywhere,
it may have unexpected side effects (like it did for QML plugins since it is
included from qimportbase.pri).

File:

• trunk/src/qbase.pri (modified) (2 diffs)

trunk/src/qbase.pri

@@ -3 +3 @@
 isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700
 TEMPLATE        = lib
-
-include(qt_targets.pri)
-
+isEmpty(QT_MAJOR_VERSION) {
+   VERSION=4.7.3
+} else {
+   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
+}
 mac:!contains(QMAKE_EXT_C, .mm):QMAKE_EXT_C += .mm
 
@@ -179 +181 @@
 QMAKE_PKGCONFIG_VARIABLES += moc_dir uic_dir rcc_dir lupdate_dir lrelease_dir
 
+
+
 win32:DEFINES+=_USE_MATH_DEFINES