diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-08-03 23:53:47 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-01 04:41:21 (GMT) |
| commit | 27d822ccb43ff5e10754a930473f516654315430 (patch) | |
| tree | 998630bc56e7a314c1bcdafe4f854989d57eda45 /src | |
| parent | 3bfbc7d1554590646fef81a10c07d36f1479fcac (diff) | |
| download | Qt-27d822ccb43ff5e10754a930473f516654315430.zip Qt-27d822ccb43ff5e10754a930473f516654315430.tar.gz Qt-27d822ccb43ff5e10754a930473f516654315430.tar.bz2 | |
Phonon; Use correct Phonon version numbers.
Task-number: QTBUG-12627
Reviewed-by: Andrew den Exter
(cherry picked from commit 5569070c39a5778cb9e2ff1bab32993217e788c5)
Diffstat (limited to 'src')
| -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 |