Changeset 385


Ignore:
Timestamp:
Dec 5, 2009, 2:33:42 AM (15 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
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/src/plugins/qpluginbase.pri

    r158 r385  
    11TEMPLATE = lib
    2 isEmpty(QT_MAJOR_VERSION) {
    3    VERSION=4.5.1
    4 } else {
    5    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
    6 }
     2
     3include(../qt_targets.pri)
     4
    75CONFIG += qt plugin
    86
    … …  
    1210contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
    1311
    14 include(../qt_targets.pri)
    15 
    1612wince*:LIBS += $$QMAKE_LIBS_GUI

  • TabularUnified trunk/src/qbase.pri

    r158 r385  
    44isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700
    55TEMPLATE        = lib
    6 isEmpty(QT_MAJOR_VERSION) {
    7    VERSION=4.5.1
    8 } else {
    9    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
    10 }
     6
     7include(qt_targets.pri)
     8
    119mac:!contains(QMAKE_EXT_C, .mm):QMAKE_EXT_C += .mm
    1210
    … …  
    151149QMAKE_PKGCONFIG_VARIABLES += moc_dir uic_dir
    152150
    153 include(qt_targets.pri)
    154 
    155151win32:DEFINES+=_USE_MATH_DEFINES

  • TabularUnified trunk/src/qt_targets.pri

    r383 r385  
    44QMAKE_TARGET_COPYRIGHT = Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
    55
     6isEmpty(QT_MAJOR_VERSION) {
     7   VERSION=4.5.1
     8} else {
     9   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
     10}
     11
    612os2 {
    7     # set QMAKE_TARGET_COMPANY to the actual binary OS/2 build vendor. The above 
     13    # set QMAKE_TARGET_COMPANY to the actual binary OS/2 build vendor. The above
    814    # copyright notice will be still retained in the DLL and EXE description.
    915        contains(QT_CONFIG, official_build):QMAKE_TARGET_COMPANY = netlabs.org
    1016        else:QMAKE_TARGET_COMPANY = $$(USER)
    1117        isEmpty(QMAKE_TARGET_COMPANY):QMAKE_TARGET_COMPANY = anonymous
     18
     19        # extend the version number included in DLLs and EXEs with the SVN revision number
     20        DEF_FILE_VERSION = $$VERSION
     21    !isEmpty(QT_BUILD_VERSION):DEF_FILE_VERSION = $${DEF_FILE_VERSION}-$${QT_BUILD_VERSION}
     22    !isEmpty(QMAKESPEC):DEF_FILE_VERSION = $${DEF_FILE_VERSION}_$$basename(QMAKESPEC)
    1223}

  • TabularUnified trunk/tools/assistant/tools/assistant/assistant.pro

    r2 r385  
    8888    }
    8989}
     90
     91include(../../../../src/qt_targets.pri)

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

    r372 r385  
    1212# QtDesignerComponents uses
    1313DEFINES += QT_STATICPLUGIN
    14 
    15 isEmpty(QT_MAJOR_VERSION) {
    16    VERSION=4.3.0
    17 } else {
    18    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
    19 }
    2014
    2115include(../../../../../src/qt_targets.pri)

  • TabularUnified trunk/tools/designer/src/designer/designer.pro

    r2 r385  
    8888unix:!mac:LIBS += -lm
    8989TRANSLATIONS = designer_de.ts
     90
     91include(../../../../src/qt_targets.pri)

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

    r369 r385  
    88DESTDIR = ../../../../lib
    99!wince*:DLLDESTDIR = ../../../../bin
    10 
    11 isEmpty(QT_MAJOR_VERSION) {
    12    VERSION=4.3.0
    13 } else {
    14    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
    15 }
    1610
    1711unix:QMAKE_PKGCONFIG_REQUIRES += QtXml

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

    r2 r385  
    99
    1010DEFINES += QFORMINTERNAL_NAMESPACE QT_DESIGNER_STATIC QT_FORMBUILDER_NO_SCRIPT
    11 isEmpty(QT_MAJOR_VERSION) {
    12    VERSION=4.3.0
    13 } else {
    14    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
    15 }
     11
    1612include(../../../../src/qt_targets.pri)
    1713QMAKE_TARGET_PRODUCT = UiLoader

  • TabularUnified trunk/tools/linguist/lconvert/lconvert.pro

    r2 r385  
    2121target.path=$$[QT_INSTALL_BINS]
    2222INSTALLS        += target
     23
     24include(../../../src/qt_targets.pri)

  • TabularUnified trunk/tools/linguist/linguist/linguist.pro

    r2 r385  
    105105             $$[QT_INSTALL_TRANSLATIONS]/linguist_de.ts \
    106106             $$[QT_INSTALL_TRANSLATIONS]/linguist_fr.ts
     107
     108include(../../../src/qt_targets.pri)

  • TabularUnified trunk/tools/linguist/lrelease/lrelease.pro

    r2 r385  
    2323target.path=$$[QT_INSTALL_BINS]
    2424INSTALLS        += target
     25
     26include(../../../src/qt_targets.pri)

  • TabularUnified trunk/tools/linguist/lupdate/lupdate.pro

    r2 r385  
    3333INSTALLS        += target
    3434
     35include(../../../src/qt_targets.pri)
     36
Note: See TracChangeset for help on using the changeset viewer.