diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-04 01:13:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-04 01:13:38 (GMT) |
| commit | ae4e3e8bc4ea3238aec09fd8b37a04fdbf74fed3 (patch) | |
| tree | 14fd0e0dc2b8e26e1a7f85915a531852ad35d566 | |
| parent | 10d35e53d97e32018ae20632b86c1261a474dc2a (diff) | |
| parent | 5569070c39a5778cb9e2ff1bab32993217e788c5 (diff) | |
| download | Qt-ae4e3e8bc4ea3238aec09fd8b37a04fdbf74fed3.zip Qt-ae4e3e8bc4ea3238aec09fd8b37a04fdbf74fed3.tar.gz Qt-ae4e3e8bc4ea3238aec09fd8b37a04fdbf74fed3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Phonon; Use correct Phonon version numbers.
| -rw-r--r-- | src/3rdparty/phonon/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/3rdparty/phonon/phonon/phononnamespace.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/phonon/CMakeLists.txt b/src/3rdparty/phonon/CMakeLists.txt index ef7d6f5..e2054d3 100644 --- a/src/3rdparty/phonon/CMakeLists.txt +++ b/src/3rdparty/phonon/CMakeLists.txt @@ -152,8 +152,8 @@ set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) set(CMAKE_COLOR_MAKEFILE ON) set(PHONON_LIB_MAJOR_VERSION "4") -set(PHONON_LIB_MINOR_VERSION "3") -set(PHONON_LIB_PATCH_VERSION "80") +set(PHONON_LIB_MINOR_VERSION "4") +set(PHONON_LIB_PATCH_VERSION "0") set(PHONON_LIB_VERSION "${PHONON_LIB_MAJOR_VERSION}.4.0") set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION}) diff --git a/src/3rdparty/phonon/phonon/phononnamespace.h b/src/3rdparty/phonon/phonon/phononnamespace.h index ec42d51..eb899de 100644 --- a/src/3rdparty/phonon/phonon/phononnamespace.h +++ b/src/3rdparty/phonon/phonon/phononnamespace.h @@ -41,12 +41,12 @@ /** * PHONON_VERSION is (major << 16) + (minor << 8) + patch. */ -#define PHONON_VERSION PHONON_VERSION_CHECK(4, 3, 1) +#define PHONON_VERSION PHONON_VERSION_CHECK(4, 4, 0) /** * PHONON_VERSION_STR is "major.minor.patch". E.g. "4.2.1" */ -#define PHONON_VERSION_STR "4.3.1" +#define PHONON_VERSION_STR "4.4.0" QT_BEGIN_HEADER QT_BEGIN_NAMESPACE |