diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-02 13:59:19 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-26 14:43:11 +0200 |
| commit | 25e10e1e8a33059cac946c102875523a34f92199 (patch) | |
| tree | 4d9e4c19562a17ef2e5ab95ff220b003eaa56d2c | |
| parent | ba4e0300d3b748a59372553f7a64036a98fccf41 (diff) | |
auto-generate module pris
note that this changes the library version from 5.4.0 to 5.0.0. this is
"less wrong", as in "it matches the real version of at least one of the
involved parts".
Change-Id: I41963d4187898414ed6e86f711cb873cd22ec904
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | modules/qt_phonon.pri | 17 | ||||
| -rw-r--r-- | src/phonon/phonon.pro | 11 | ||||
| -rw-r--r-- | sync.profile | 3 |
3 files changed, 5 insertions, 26 deletions
diff --git a/modules/qt_phonon.pri b/modules/qt_phonon.pri deleted file mode 100644 index f8c1d3c..0000000 --- a/modules/qt_phonon.pri +++ /dev/null @@ -1,17 +0,0 @@ -QT.phonon.VERSION = 5.0.0 -QT.phonon.MAJOR_VERSION = 5 -QT.phonon.MINOR_VERSION = 0 -QT.phonon.PATCH_VERSION = 0 - -QT.phonon.name = phonon -QT.phonon.bins = $$QT_MODULE_BIN_BASE -QT.phonon.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/phonon -QT.phonon.private_includes = $$QT_MODULE_INCLUDE_BASE/phonon/$$QT.phonon.VERSION -QT.phonon.sources = $$QT_MODULE_BASE/src/3rdparty/phonon/phonon -QT.phonon.libs = $$QT_MODULE_LIB_BASE -QT.phonon.plugins = $$QT_MODULE_PLUGIN_BASE -QT.phonon.imports = $$QT_MODULE_IMPORT_BASE -QT.phonon.depends = core gui network -QT.phonon.DEFINES = QT_PHONON_LIB - -QT_CONFIG += phonon diff --git a/src/phonon/phonon.pro b/src/phonon/phonon.pro index 6805f81..4ad7b23 100644 --- a/src/phonon/phonon.pro +++ b/src/phonon/phonon.pro @@ -2,14 +2,13 @@ load(qt_module) TARGET = phonon QPRO_PWD = $$PWD -load(qt_module_config) - QT += widgets -PHONON_MAJOR_VERSION = $${QT_MAJOR_VERSION} -PHONON_MINOR_VERSION = 4 -PHONON_PATCH_VERSION = 0 -VERSION = $${PHONON_MAJOR_VERSION}.$${PHONON_MINOR_VERSION}.$${PHONON_PATCH_VERSION} +# This would conflict with the Qt 4.x build. +# And any other version than the Qt version itself would be arbitrary. +#VERSION = 4.4.0 + +load(qt_module_config) DEPENDPATH += . DEFINES += MAKE_PHONON_LIB diff --git a/sync.profile b/sync.profile index 9e46349..bea6e34 100644 --- a/sync.profile +++ b/sync.profile @@ -11,9 +11,6 @@ "gui" => "#include <QtGui/QtGui>\n", "network" => "#include <QtNetwork/QtNetwork>\n", ); -%modulepris = ( - "phonon" => "$basedir/modules/qt_phonon.pri", -); # Module dependencies. # Every module that is required to build this module should have one entry. # Each of the module version specifiers can take one of the following values: |