From 0710f1743d24b0d7f0ab0e93a0a0435e572a092d Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Fri, 1 Apr 2011 05:47:28 -0500 Subject: [PATCH 1/3] Add module.prf, and install MODULE_PRI for each module Output warning if not present --- src/multimedia/multimedia.pro | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 781a29a8..8d7483ee 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -4,6 +4,9 @@ TARGET = QtMultimedia QPRO_PWD = $$PWD QT = core gui +CONFIG += module +MODULE_PRI = ../../modules/qt_multimedia.pri + DEFINES += QT_BUILD_MULTIMEDIA_LIB QT_NO_USING_NAMESPACE unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui From a9f96c8d712eb878ad83556993f3316a58056b89 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Thu, 21 Apr 2011 07:55:55 -0500 Subject: [PATCH 2/3] Use private headers --- modules/qt_multimedia.pri | 10 +++++----- src/multimedia/multimedia.pro | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/qt_multimedia.pri b/modules/qt_multimedia.pri index 469e5c8c..481886f0 100644 --- a/modules/qt_multimedia.pri +++ b/modules/qt_multimedia.pri @@ -1,12 +1,12 @@ -QT_MULTIMEDIA_VERSION = $$QT_VERSION -QT_MULTIMEDIA_MAJOR_VERSION = $$QT_MAJOR_VERSION -QT_MULTIMEDIA_MINOR_VERSION = $$QT_MINOR_VERSION -QT_MULTIMEDIA_PATCH_VERSION = $$QT_PATCH_VERSION +QT.multimedia.VERSION = 4.8.0 +QT.multimedia.MAJOR_VERSION = 4 +QT.multimedia.MINOR_VERSION = 8 +QT.multimedia.PATCH_VERSION = 0 QT.multimedia.name = QtMultimedia QT.multimedia.bins = $$QT_MODULE_BIN_BASE QT.multimedia.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMultimedia -QT.multimedia.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimedia/private +QT.multimedia.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimedia/$$QT.multimedia.VERSION QT.multimedia.sources = $$QT_MODULE_BASE/src/multimedia QT.multimedia.libs = $$QT_MODULE_LIB_BASE QT.multimedia.plugins = $$QT_MODULE_PLUGIN_BASE diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 8d7483ee..405c51c1 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -2,7 +2,7 @@ load(qt_module) TARGET = QtMultimedia QPRO_PWD = $$PWD -QT = core gui +QT = core-private gui CONFIG += module MODULE_PRI = ../../modules/qt_multimedia.pri From 11999724f013e8493e76c9672520ccad8d4a9089 Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 3 May 2011 16:21:07 +0200 Subject: [PATCH 3/3] Added .tag file with Git revision. --- .gitattributes | 1 + .tag | 1 + 2 files changed, 2 insertions(+) create mode 100644 .gitattributes create mode 100644 .tag diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..a3c61083 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +.tag ident diff --git a/.tag b/.tag new file mode 100644 index 00000000..055c8729 --- /dev/null +++ b/.tag @@ -0,0 +1 @@ +$Id$