diff options
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 21 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_pris.prf | 3 | ||||
| -rw-r--r-- | src/corelib/global/qglobal_p.h | 5 |
3 files changed, 1 insertions, 28 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 8867785335..588a8ee0f5 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -557,18 +557,6 @@ defineReplace(qtConfLibraryArgs) { return($$qmake_args) } -defineReplace(qtConfGetHexVersion) { - version = $$split(1, '.') - number = - for(i, 0..2) { - n = $$member(version, $$i) - isEmpty(n): n = 0 - number += $$format_number($$n, obase=16 zeropad width=2) - } - number = "0x$$join(number)" - return($$number) -} - defineTest(qtConfExportLibrary) { isEmpty(2): return() !$$qtConfEvaluate($$eval($${1}.export)): return() @@ -578,7 +566,6 @@ defineTest(qtConfExportLibrary) { eval(libs = $$eval($${1}.libs)) eval(cflags = $$eval($${1}.cflags)) eval(includes = $$eval($${1}.includedir)) - version = $$eval($${1}.version) # Split $$cflags into stuff that goes into DEFINES, INCLUDEPATH, and other stuff. defines = @@ -606,14 +593,6 @@ defineTest(qtConfExportLibrary) { $$eval($${1}.builds.$${b})) !isEmpty(defines): qtConfOutputVar(assign, $$output, QMAKE_DEFINES_$$NAME, $$defines) !isEmpty(includes): qtConfOutputVar(assign, $$output, QMAKE_INCDIR_$$NAME, $$includes) - !isEmpty(version) { - qtConfOutputVar(assign, $$output, QMAKE_$${NAME}_VERSION, $$version) - qtConfOutputSetDefine("privateHeader", "QT_LIBRARY_VERSION_$${2}", $$qtConfGetHexVersion($$version)) - version = $$split(version, '.') - qtConfOutputVar(assign, $$output, QMAKE_$${NAME}_VERSION_MAJOR, $$member(version, 0)) - qtConfOutputVar(assign, $$output, QMAKE_$${NAME}_VERSION_MINOR, $$member(version, 1)) - qtConfOutputVar(assign, $$output, QMAKE_$${NAME}_VERSION_PATCH, $$member(version, 2)) - } !isEmpty($${currentConfig}.module): \ qtConfExtendVar($$output, "QT.$${currentModule}_private.libraries", $$2) } diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf index b4a047fe17..30f7be640d 100644 --- a/mkspecs/features/qt_module_pris.prf +++ b/mkspecs/features/qt_module_pris.prf @@ -57,8 +57,7 @@ defineReplace(qtExportLibsForModule) { NAME = $$upper($$lib) vars = \ QMAKE_LIBS_$$NAME QMAKE_LIBS_$${NAME}_DEBUG QMAKE_LIBS_$${NAME}_RELEASE \ - QMAKE_DEFINES_$$NAME QMAKE_INCDIR_$$NAME QMAKE_$${NAME}_VERSION \ - QMAKE_$${NAME}_VERSION_MAJOR QMAKE_$${NAME}_VERSION_MINOR QMAKE_$${NAME}_VERSION_PATCH + QMAKE_DEFINES_$$NAME QMAKE_INCDIR_$$NAME for (var, vars) { !isEmpty($$var): \ result += "$$var = $$val_escape($$var)" diff --git a/src/corelib/global/qglobal_p.h b/src/corelib/global/qglobal_p.h index c329357f46..b8f9e5fbf7 100644 --- a/src/corelib/global/qglobal_p.h +++ b/src/corelib/global/qglobal_p.h @@ -53,10 +53,5 @@ #include <QtCore/private/qtcore-config_p.h> #endif -#define QT_LIBRARY_VERSION(lib) QT_LIBRARY_VERSION_##lib -#define QT_LIBRARY_VERSION_MAJOR(lib) (QT_LIBRARY_VERSION_##lib >> 16) -#define QT_LIBRARY_VERSION_MINOR(lib) ((QT_LIBRARY_VERSION_##lib >> 8) & 0xff) -#define QT_LIBRARY_VERSION_PATCH(lib) (QT_LIBRARY_VERSION_##lib & 0xff) - #endif // QGLOBAL_P_H |