Changeset 385 for trunk/tools

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/tools

Files:

• assistant/tools/assistant/assistant.pro (modified) (1 diff)
• designer/src/components/lib/lib.pro (modified) (1 diff)
• designer/src/designer/designer.pro (modified) (1 diff)
• designer/src/lib/lib.pro (modified) (1 diff)
• designer/src/uitools/uitools.pro (modified) (1 diff)
• linguist/lconvert/lconvert.pro (modified) (1 diff)
• linguist/linguist/linguist.pro (modified) (1 diff)
• linguist/lrelease/lrelease.pro (modified) (1 diff)
• linguist/lupdate/lupdate.pro (modified) (1 diff)

trunk/tools/assistant/tools/assistant/assistant.pro

@@ -88 +88 @@
     }
 }
+
+include(../../../../src/qt_targets.pri)

trunk/tools/designer/src/components/lib/lib.pro

@@ -12 +12 @@
 # QtDesignerComponents uses
 DEFINES += QT_STATICPLUGIN
-
-isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.3.0
-} else {
-   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-}
 
 include(../../../../../src/qt_targets.pri)

trunk/tools/designer/src/designer/designer.pro

@@ -88 +88 @@
 unix:!mac:LIBS += -lm
 TRANSLATIONS = designer_de.ts
+
+include(../../../../src/qt_targets.pri)

trunk/tools/designer/src/lib/lib.pro

@@ -8 +8 @@
 DESTDIR = ../../../../lib
 !wince*:DLLDESTDIR = ../../../../bin
-
-isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.3.0
-} else {
-   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-}
 
 unix:QMAKE_PKGCONFIG_REQUIRES += QtXml

trunk/tools/designer/src/uitools/uitools.pro

@@ -9 +9 @@
 
 DEFINES += QFORMINTERNAL_NAMESPACE QT_DESIGNER_STATIC QT_FORMBUILDER_NO_SCRIPT
-isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.3.0
-} else {
-   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-}
+
 include(../../../../src/qt_targets.pri)
 QMAKE_TARGET_PRODUCT = UiLoader

trunk/tools/linguist/lconvert/lconvert.pro

@@ -21 +21 @@
 target.path=$$[QT_INSTALL_BINS]
 INSTALLS        += target
+
+include(../../../src/qt_targets.pri)

trunk/tools/linguist/linguist/linguist.pro

@@ -105 +105 @@
              $$[QT_INSTALL_TRANSLATIONS]/linguist_de.ts \
              $$[QT_INSTALL_TRANSLATIONS]/linguist_fr.ts
+
+include(../../../src/qt_targets.pri)

trunk/tools/linguist/lrelease/lrelease.pro

@@ -23 +23 @@
 target.path=$$[QT_INSTALL_BINS]
 INSTALLS        += target
+
+include(../../../src/qt_targets.pri)

trunk/tools/linguist/lupdate/lupdate.pro

@@ -33 +33 @@
 INSTALLS        += target
 
+include(../../../src/qt_targets.pri)
+