diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-10-19 17:20:10 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-10-19 17:20:10 -0200 |
| commit | 4a638ed6347ebe82c9093b1bb229f062a703a6a8 (patch) | |
| tree | dd8ef83dc3874ecc7d459343d75a08cdd5e37c30 /CMakeLists.txt | |
| parent | ae942fd5dae9e59cae78a32ed598001bf70e523e (diff) | |
| parent | c86a509af1a1a44d449aeb68858e17007e53e12a (diff) | |
Merge remote branch 'mainline/1.0'
Conflicts:
CMakeLists.txt
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dc8f23467..58f7a523b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,9 +68,9 @@ if(AVOID_PROTECTED_HACK OR WIN32) endif() set(BINDING_NAME PySide) -set(BINDING_API_MAJOR_VERSION "0") -set(BINDING_API_MINOR_VERSION "4") -set(BINDING_API_MICRO_VERSION "2") +set(BINDING_API_MAJOR_VERSION "1") +set(BINDING_API_MINOR_VERSION "0") +set(BINDING_API_MICRO_VERSION "0") set(BINDING_API_VERSION "${BINDING_API_MAJOR_VERSION}.${BINDING_API_MINOR_VERSION}.${BINDING_API_MICRO_VERSION}" CACHE STRING "PySide version" FORCE) set(PYSIDE_QT_VERSION "${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}" CACHE STRING "Qt version used to compile PySide" FORCE) if(ENABLE_VERSION_SUFFIX) |