Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging:
  Add QT_xxx_VERSION macros for each library in qtbase

9 files changed, 22 insertions, 0 deletions

diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index a31d1e5b7f..1e1e4dacf6 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -11,6 +11,9 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x67000000
 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
 
 include(../qbase.pri)
+
+HEADERS += $$QT_SOURCE_TREE/src/corelib/qtcoreversion.h
+
 include(animation/animation.pri)
 include(arch/arch.pri)
 include(concurrent/concurrent.pri)
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
index e73fa05a74..731d20a893 100644
--- a/src/dbus/dbus.pro
+++ b/src/dbus/dbus.pro
@@ -32,6 +32,9 @@ win32 {
     else:LIBS_PRIVATE += -ldbus-1
 }
 include(../qbase.pri)
+
+HEADERS += $$QT_SOURCE_TREE/src/dub/qtdbusversion.h
+
 PUB_HEADERS = qdbusargument.h \
     qdbusconnectioninterface.h \
     qdbusmacros.h \
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 072553a05c..7e9d78d0bb 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -15,6 +15,8 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
 
 include(../qbase.pri)
 
+HEADERS += $$QT_SOURCE_TREE/src/gui/qtguiversion.h
+
 contains(QT_CONFIG, x11sm):CONFIG += x11sm
 
 #platforms
diff --git a/src/network/network.pro b/src/network/network.pro
index fc5d08d936..4ee71b028e 100644
--- a/src/network/network.pro
+++ b/src/network/network.pro
@@ -19,6 +19,9 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x64000000
 unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
 
 include(../qbase.pri)
+
+HEADERS += $$QT_SOURCE_TREE/src/network/qtnetworkversion.h
+
 include(access/access.pri)
 include(bearer/bearer.pri)
 include(kernel/kernel.pri)
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 849bd9ebc7..b30d4057db 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -15,6 +15,8 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
 
 include(../qbase.pri)
 
+HEADERS += $$QT_SOURCE_TREE/src/opengl/qtopenglversion.h
+
 !win32:!embedded:!mac:!symbian:!qpa:CONFIG	   += x11
 contains(QT_CONFIG, opengl):CONFIG += opengl
 contains(QT_CONFIG, opengles1):CONFIG += opengles1
diff --git a/src/openvg/openvg.pro b/src/openvg/openvg.pro
index dbe1620f80..0e22503c3b 100644
--- a/src/openvg/openvg.pro
+++ b/src/openvg/openvg.pro
@@ -52,6 +52,8 @@ symbian {
 
 include(../qbase.pri)
 
+HEADERS += $$QT_SOURCE_TREE/src/openvg/qtopenvgversion.h
+
 unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
 symbian:TARGET.UID3 = 0x2001E62F
 
diff --git a/src/sql/sql.pro b/src/sql/sql.pro
index f1bdd6bda1..c7cbbc4985 100644
--- a/src/sql/sql.pro
+++ b/src/sql/sql.pro
@@ -13,6 +13,8 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
 
 include(../qbase.pri)
 
+HEADERS += $$QT_SOURCE_TREE/src/sql/qtsqlversion.h
+
 DEFINES += QT_NO_CAST_FROM_ASCII
 PRECOMPILED_HEADER = ../corelib/global/qt_pch.h
 SQL_P = sql
diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro
index 311c79379b..3408c91420 100644
--- a/src/testlib/testlib.pro
+++ b/src/testlib/testlib.pro
@@ -85,6 +85,9 @@ qpa:mac: {
 }
 
 include(../qbase.pri)
+
+HEADERS += $$QT_SOURCE_TREE/src/testlib/qttestlibversion.h
+
 QMAKE_TARGET_PRODUCT = QTestLib
 QMAKE_TARGET_DESCRIPTION = Qt \
     Unit \
diff --git a/src/xml/xml.pro b/src/xml/xml.pro
index 68bb20b009..986e478b69 100644
--- a/src/xml/xml.pro
+++ b/src/xml/xml.pro
@@ -12,6 +12,8 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore
 
 include(../qbase.pri)
 
+HEADERS += $$QT_SOURCE_TREE/src/xml/qtxmlversion.h
+
 PRECOMPILED_HEADER = ../corelib/global/qt_pch.h
 
 win32-borland {