Changeset 1077 for trunk/src


Ignore:
Timestamp:
Sep 13, 2011, 1:44:23 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

Use a common file for VERSION definition.

This is much better than spreading this information over five
different files (three of which are forgotten and haven't been
updated since Qt 4.3.0).

This fixes a r1050 regression that caused Designer DLLs to
lose the major version suffix and completely supersedes r385
(still fixing what r1050 fixed).

Location:
trunk/src
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/plugins/qpluginbase.pri

    r1054 r1077  
    11TEMPLATE = lib
    2 isEmpty(QT_MAJOR_VERSION) {
    3    VERSION=4.7.3
    4 } else {
    5    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
    6 }
    72CONFIG += qt plugin
    83
    … …  
    127contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
    138
     9include(../qt_version.pri)
    1410include(../qt_targets.pri)
    1511

  • trunk/src/qbase.pri

    r1070 r1077  
    33isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700
    44TEMPLATE        = lib
    5 isEmpty(QT_MAJOR_VERSION) {
    6    VERSION=4.7.3
    7 } else {
    8    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
    9 }
    105mac:!contains(QMAKE_EXT_C, .mm):QMAKE_EXT_C += .mm
    116
    … …  
    181176QMAKE_PKGCONFIG_VARIABLES += moc_dir uic_dir rcc_dir lupdate_dir lrelease_dir
    182177
     178include(qt_version.pri)
    183179include(qt_targets.pri)
    184180
Note: See TracChangeset for help on using the changeset viewer.