Changeset 385 for trunk/src

Timestamp:

Dec 5, 2009, 2:33:42 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

general: Moved VERSION definition to src/qt_targets.pri to have it in a single source and together with other relevant information. Added inclusion of src/qt_targets.pri by linguist, assistant and designer application projects so that they will embed version information too.

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
-isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.5.1
-} else {
-   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-}
+
+include(../qt_targets.pri)
+
 CONFIG += qt plugin
 
@@ -12 +10 @@
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 
-include(../qt_targets.pri)
-
 wince*:LIBS += $$QMAKE_LIBS_GUI

trunk/src/qbase.pri

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

trunk/src/qt_targets.pri

@@ -4 +4 @@
 QMAKE_TARGET_COPYRIGHT = Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
 
+isEmpty(QT_MAJOR_VERSION) {
+   VERSION=4.5.1
+} else {
+   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
+}
+
 os2 {
-    # set QMAKE_TARGET_COMPANY to the actual binary OS/2 build vendor. The above 
+    # set QMAKE_TARGET_COMPANY to the actual binary OS/2 build vendor. The above
     # copyright notice will be still retained in the DLL and EXE description.
         contains(QT_CONFIG, official_build):QMAKE_TARGET_COMPANY = netlabs.org
         else:QMAKE_TARGET_COMPANY = $$(USER)
         isEmpty(QMAKE_TARGET_COMPANY):QMAKE_TARGET_COMPANY = anonymous
+
+        # extend the version number included in DLLs and EXEs with the SVN revision number
+        DEF_FILE_VERSION = $$VERSION
+    !isEmpty(QT_BUILD_VERSION):DEF_FILE_VERSION = $${DEF_FILE_VERSION}-$${QT_BUILD_VERSION}
+    !isEmpty(QMAKESPEC):DEF_FILE_VERSION = $${DEF_FILE_VERSION}_$$basename(QMAKESPEC)
 }