Changeset 1050

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).

Location:

trunk/src

Files:

• plugins/qpluginbase.pri (modified) (2 diffs)
• qbase.pri (modified) (2 diffs)
• qt_targets.pri (modified) (1 diff)

trunk/src/plugins/qpluginbase.pri

@@ -1 +1 @@
 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}
+}
 CONFIG += qt plugin
 
@@ -9 +11 @@
 !isEmpty(TARGET_SHORT):TARGET_SHORT = $$qtLibraryTarget($$TARGET_SHORT)
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
+
+include(../qt_targets.pri)
 
 wince*:LIBS += $$QMAKE_LIBS_GUI

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
 
+include(qt_targets.pri)
+
 win32:DEFINES+=_USE_MATH_DEFINES
 

trunk/src/qt_targets.pri

@@ -3 +3 @@
 QMAKE_TARGET_DESCRIPTION = C++ application development framework.
 QMAKE_TARGET_COPYRIGHT = Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-
-isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.7.3
-} else {
-   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-}
 
 os2 {