From 1af49e5713f05a116de946afe152015d41813eab Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Fri, 21 Jan 2011 16:14:58 -0300 Subject: [PATCH 001/581] Bump version to beta5. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ac46b5..8e0ebbe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project(pysidebindings) cmake_minimum_required(VERSION 2.6) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Macros/ ${CMAKE_MODULE_PATH}) -find_package(GeneratorRunner 0.6.4 REQUIRED) +find_package(GeneratorRunner 0.6.5 REQUIRED) find_package(Shiboken 1.0.0 REQUIRED) find_package(Qt4 4.5.0 REQUIRED) find_file(GL_H "gl.h" PATH_SUFFIXES "GL") @@ -65,7 +65,7 @@ set(BINDING_API_MAJOR_VERSION "1") set(BINDING_API_MINOR_VERSION "0") set(BINDING_API_MICRO_VERSION "0") set(BINDING_API_RELEASE_LEVEL "beta") # alpha, beta, candidate, or final -set(BINDING_API_SERIAL 4) # leave as 0 when release level is final +set(BINDING_API_SERIAL 5) # leave as 0 when release level is final set(BINDING_API_VERSION "${BINDING_API_MAJOR_VERSION}.${BINDING_API_MINOR_VERSION}.${BINDING_API_MICRO_VERSION}" CACHE STRING "PySide version" FORCE) if (BINDING_API_RELEASE_LEVEL STREQUAL "final") set(BINDING_API_VERSION_FULL "${BINDING_API_MAJOR_VERSION}.${BINDING_API_MINOR_VERSION}.${BINDING_API_MICRO_VERSION}" From f2cce0a1b594efc6edf901848a609f3f7209e870 Mon Sep 17 00:00:00 2001 From: Hugo Parente Lima Date: Mon, 24 Jan 2011 10:23:30 -0200 Subject: [PATCH 002/581] Fix bug#636 - "Unable to navigate back to the main site from the generated documentation" --- doc/_themes/pysidedocs/layout.html | 2 +- doc/_themes/pysidedocs/static/pysidedocs.css | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/_themes/pysidedocs/layout.html b/doc/_themes/pysidedocs/layout.html index f6d9ac9..9b6abe7 100644 --- a/doc/_themes/pysidedocs/layout.html +++ b/doc/_themes/pysidedocs/layout.html @@ -77,7 +77,7 @@