# HG changeset patch
# User Jeandet Alexis
# Date 2014-06-19 13:10:38
# Node ID 7250c4578e1b2cf43b5bbec654dcf506b1966823
# Parent  f6dfc217ca2f6bc205d91d6c5ba7894863fa186d

Cleaned build scripts.

diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -1,3 +1,4 @@
 syntax: glob
 *.o
 moc_*
+*.pro.user
diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,186 +0,0 @@
-project(PythonQt)
-cmake_minimum_required(VERSION 2.8.10)
-
-IF(POLICY CMP0020)
-    cmake_policy(SET CMP0020 NEW)
-ENDIF()
-
-include(CTestUseLaunchers OPTIONAL)
-
-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-
-#-----------------------------------------------------------------------------
-# Version
-SET(PythonQt_VERSION 2.2.0)
-
-#-----------------------------------------------------------------------------
-# Debug
-option(PythonQt_DEBUG "Enable/Disable PythonQt debug output" OFF)
-if(PythonQt_DEBUG)
-	add_definitions(-DPYTHONQT_DEBUG)
-else()
-	remove_definitions(-DPYTHONQT_DEBUG)
-endif()
-
-if(NOT CMAKE_BUILD_TYPE)
-	set(CMAKE_BUILD_TYPE Release)
-endif()
-
-#-----------------------------------------------------------------------------
-# Qt
-option(PythonQt_Qt5 "Use Qt 5.x" OFF)
-if(PythonQt_Qt5)
-	include(PythonQt_Qt_5x)
-else(PythonQt_Qt5)
-	include(PythonQt_Qt_4x)
-endif(PythonQt_Qt5)
-
-#-----------------------------------------------------------------------------
-# The variable "generated_cpp_suffix" allows to conditionnally compile the generated wrappers
-# associated with the Qt version being used.
-set(generated_cpp_suffix "_${QT_VERSION_MAJOR}${QT_VERSION_MINOR}")
-
-if("${generated_cpp_suffix}" STREQUAL "_48")
-	set(generated_cpp_suffix "")
-endif()
-if("${generated_cpp_suffix}" STREQUAL "_46")
-	set(generated_cpp_suffix "_47") # Also use 4.7 wrappers for 4.6.x version
-endif()
-
-# All 5.x use the same for now
-if("${QT_VERSION_MAJOR}" STREQUAL "5")
-	set(generated_cpp_suffix "_50")
-endif()
-
-#-----------------------------------------------------------------------------
-# Generator
-if(PythonQt_Qt5)
-	add_subdirectory(generator_50 EXCLUDE_FROM_ALL)
-	add_custom_target(generator)
-	add_dependencies(generator pythonqt_generator)
-endif()
-
-# TODO
-
-#-----------------------------------------------------------------------------
-# Build options
-
-#option(PythonQt_Wrap_QtAll "Make all Qt components available in python" OFF)
-#
-#set(qtlibs core gui network opengl sql svg uitools webkit xml xmlpatterns)
-#foreach(qtlib ${qtlibs})
-#	OPTION(PythonQt_Wrap_Qt${qtlib} "Make all of Qt${qtlib} available in python" OFF)
-#endforeach()
-
-# Force option if it applies
-#if(PythonQt_Wrap_QtAll)
-#	list(REMOVE_ITEM qtlibs xmlpatterns) # xmlpatterns wrapper does *NOT* build at all :(
-#	foreach(qtlib ${qtlibs})
-#		if(NOT ${PythonQt_Wrap_Qt${qtlib}})
-#			set(PythonQt_Wrap_Qt${qtlib} ON CACHE BOOL "Make all of Qt${qtlib} available in python" FORCE)
-#			message(STATUS "Enabling [PythonQt_Wrap_Qt${qtlib}] because of [PythonQt_Wrap_QtAll] evaluates to True")
-#		endif()
-#	endforeach()
-#endif()
-
-#-----------------------------------------------------------------------------
-# Add extra sources
-#foreach(qtlib core gui network opengl sql svg uitools webkit xml xmlpatterns)
-#
-#	if (${PythonQt_Wrap_Qt${qtlib}})
-#
-#		ADD_DEFINITIONS(-DPYTHONQT_WRAP_Qt${qtlib})
-#
-#		set(file_prefix generated_cpp${generated_cpp_suffix}/com_trolltech_qt_${qtlib}/com_trolltech_qt_${qtlib})
-#
-#		foreach(index RANGE 0 11)
-#
-#			# Source files
-#			if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file_prefix}${index}.cpp)
-#				list(APPEND sources ${file_prefix}${index}.cpp)
-#			endif()
-#
-#			# Headers that should run through moc
-#			if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file_prefix}${index}.h)
-#				list(APPEND moc_sources ${file_prefix}${index}.h)
-#			endif()
-#
-#		endforeach()
-#
-#		list(APPEND sources ${file_prefix}_init.cpp)
-#
-#	endif()
-#endforeach()
-
-#-----------------------------------------------------------------------------
-# Find Python
-option(PythonQt_Python3 "Use Python 3.x (3.3+)" OFF)
-option(PythonQt_Python "Use specific Python Version" OFF)
-if(PythonQt_Python)
-	find_package(Python ${PythonQt_Python} REQUIRED EXACT)
-elseif(PythonQt_Python3)
-	find_package(Python 3.3 REQUIRED)
-else()
-	find_package(Python 2.6 REQUIRED)
-endif()
-
-if(NOT ${PYTHON_VERSION} VERSION_LESS 3)
-	set(PythonQt_Python3 ON)
-else()
-	set(PythonQt_Python3 OFF)
-endif()
-
-include_directories(${PYTHON_INCLUDE_DIRS})
-add_definitions(-DPYTHONQT_USE_RELEASE_PYTHON_FALLBACK)
-
-#-----------------------------------------------------------------------------
-# Library Name
-# The variable PythonQt contains the PythonQt core library name
-#   It incorporates library mayor versions
-set(PythonQt PythonQt)
-
-if(PythonQt_Qt5)
-	set(PythonQt ${PythonQt}5)
-endif()
-
-if(PythonQt_Python3)
-	set(PythonQt ${PythonQt}_3)
-endif()
-
-set(CMAKE_DEBUG_POSTFIX "_d")
-
-message(STATUS "Building ${PythonQt} (Qt ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} + Python ${PYTHON_VERSION} | ${CMAKE_BUILD_TYPE})")
-
-#-----------------------------------------------------------------------------
-# Core
-add_subdirectory(src)
-
-#-----------------------------------------------------------------------------
-# Tests
-add_subdirectory(tests EXCLUDE_FROM_ALL)
-# test alias
-add_custom_target(test COMMAND tests/PythonQtTest WORKING_DIRECTORY ${CURRENT_BINARY_DIR})
-add_dependencies(test PythonQtTest)
-
-#-----------------------------------------------------------------------------
-# Extenseions (QtAll)
-add_subdirectory(extensions)
-# QtAll alias
-add_custom_target(QtAll)
-add_dependencies(QtAll ${PythonQt_QtAll})
-
-#-----------------------------------------------------------------------------
-# Examples
-include_directories(src)
-include_directories(extensions/PythonQt_QtAll)
-add_subdirectory(examples EXCLUDE_FROM_ALL)
-
-#-----------------------------------------------------------------------------
-# uninstall target
-configure_file(
-	"${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-	"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-	IMMEDIATE @ONLY)
-
-add_custom_target(uninstall
-	COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
diff --git a/PythonQt.pro b/PythonQt.pro
--- a/PythonQt.pro
+++ b/PythonQt.pro
@@ -3,8 +3,8 @@ TEMPLATE = subdirs
 CONFIG += ordered
 SUBDIRS = src extensions #tests examples
 
-#contains(QT_MAJOR_VERSION, 5) {
-#SUBDIRS += generator_50
-#} else {
-#SUBDIRS += generator
-#}
+contains(QT_MAJOR_VERSION, 5) {
+SUBDIRS += generator_50
+} else {
+SUBDIRS += generator
+}
diff --git a/build/PythonQt_QtAll.prf b/build/PythonQt_QtAll.prf
deleted file mode 100644
--- a/build/PythonQt_QtAll.prf
+++ /dev/null
@@ -1,13 +0,0 @@
-# profile for non-mevis users to link to PythonQt_QtAll
-
-INCLUDEPATH += $$PWD/../extensions/PythonQt_QtAll
-
-# check if debug or release
-CONFIG(debug, debug|release) {
-  DEBUG_EXT = _d 
-} else {
-  DEBUG_EXT = 
-}
-
-win32::LIBS += $$PWD/../lib/PythonQt_QtAll$${DEBUG_EXT}.lib
-unix::LIBS += -L$$PWD/../lib -lPythonQt_QtAll$${DEBUG_EXT}
diff --git a/build/common.prf b/build/common.prf
deleted file mode 100644
--- a/build/common.prf
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# depending on your Qt configuration, you want to enable or disable
-# one of the release/debug builds (if all three lines are commented,
-# the default of your Qt installation will used)
-
-# build with both debug and release mode
-#CONFIG += debug_and_release build_all
-
-# build with release mode only
-#CONFIG += release
-
-# build with debug mode only
-#CONFIG += debug
-
-# for all debug builds, add "_d" extension to target
-CONFIG(debug, debug|release) {
-  TARGET = $${TARGET}_d 
-}
-mac {
-    QMAKE_POST_LINK += bash $$PWD/../scripts/osx-fix-dylib.sh
-}
-
-#message("Directory - Build-Target: "$$PWD - $$TARGET)
diff --git a/build/python.prf b/build/python.prf
deleted file mode 100644
--- a/build/python.prf
+++ /dev/null
@@ -1,43 +0,0 @@
-# profile to include and link Python
-
-# Change this variable to your python version (2.5, 2.6)
-win32:PYTHON_VERSION=27
-unix:PYTHON_VERSION=2.7
-win32:PYTHON_PATH=C:/Python27/
-win32:PYTHON_LIB=C:/Python27/libs/
-macx {
-  # for macx you need to have the Python development kit installed as framework
-  INCLUDEPATH += /System/Library/Frameworks/Python.framework/Headers
-  LIBS += -F/System/Library/Frameworks -framework Python
-} else:win32 {
-  # for windows install a Python development kit or build Python yourself from the sources
-  # Make sure that you set the environment variable PYTHON_PATH to point to your
-  # python installation (or the python sources/header files when building from source).
-  # Make sure that you set the environment variable PYTHON_LIB to point to
-  # the directory where the python libs are located.
-  #
-  # When using the prebuild Python installer, this will be:
-  # set PYTHON_PATH = c:\Python26
-  # set PYTHON_LIB  = c:\Python26\libs
-  #
-  # When using the python sources, this will be something like:
-  # set PYTHON_PATH = c:\yourDir\Python-2.6.1\
-  # set PYTHON_LIB  = c:\yourDir\Python-2.6.1\PCbuild8\Win32
-
-  # check if debug or release
-  CONFIG(debug, debug|release) {
-    DEBUG_EXT = _d 
-  } else {
-    DEBUG_EXT = 
-  }
-
-  win32:INCLUDEPATH += $$PYTHON_PATH/PC $$PYTHON_PATH/include
-  win32-msvc*:LIBS += $$PYTHON_LIB/python$${PYTHON_VERSION}$${DEBUG_EXT}.lib
-  win32-g++:LIBS += $$PYTHON_PATH/libs/libpython$${PYTHON_VERSION}.a
-} else:unix {
-  # on linux, python-config is used to autodetect Python.
-  # make sure that you have installed a matching python-dev package.
-  
-  unix:LIBS += $$system(python$${PYTHON_VERSION}-config --libs)
-  unix:QMAKE_CXXFLAGS += $$system(python$${PYTHON_VERSION}-config --includes)
-}
diff --git a/build/pythonqt.prf b/build/pythonqt.prf
--- a/build/pythonqt.prf
+++ b/build/pythonqt.prf
@@ -1,13 +1,27 @@
 # profile for non-mevis users to link to PythonQt
 
-# profile to include and link Python
+# check if debug or release
+CONFIG(debug, debug|release) {
+  DEBUG_EXT = _d 
+} else {
+  DEBUG_EXT = 
+}
+
+#=========================================================================#
+#     ____        _   _                                    __ _           #
+#    |  _ \ _   _| |_| |__   ___  _ __     ___ ___  _ __  / _(_) __ _     #
+#    | |_) | | | | __| '_ \ / _ \| '_ \   / __/ _ \| '_ \| |_| |/ _` |    #
+#    |  __/| |_| | |_| | | | (_) | | | | | (_| (_) | | | |  _| | (_| |    #
+#    |_|    \__, |\__|_| |_|\___/|_| |_|  \___\___/|_| |_|_| |_|\__, |    #
+#           |___/                                               |___/     #
+#=========================================================================#
+#
 
 # Change this variable to your python version (2.5, 2.6)
 win32:PYTHON_VERSION=27
 unix:PYTHON_VERSION=2.7
 PYTHON_PATH=C:/Python27/
 PYTHON_LIB=C:/Python27/libs/
-INCLUDEPATH += $$[QT_INSTALL_HEADERS]/PythonQt
 macx {
   # for macx you need to have the Python development kit installed as framework
   INCLUDEPATH += /System/Library/Frameworks/Python.framework/Headers
@@ -27,12 +41,6 @@ macx {
   # set PYTHON_PATH = c:\yourDir\Python-2.6.1\
   # set PYTHON_LIB  = c:\yourDir\Python-2.6.1\PCbuild8\Win32
 
-  # check if debug or release
-  CONFIG(debug, debug|release) {
-    DEBUG_EXT = _d
-  } else {
-    DEBUG_EXT =
-  }
 
   win32:INCLUDEPATH += $$PYTHON_PATH/PC $$PYTHON_PATH/include
   win32-msvc*:LIBS += $$PYTHON_LIB/python$${PYTHON_VERSION}$${DEBUG_EXT}.lib
@@ -41,37 +49,50 @@ macx {
 } else:unix {
   # on linux, python-config is used to autodetect Python.
   # make sure that you have installed a matching python-dev package.
-
+  
   unix:LIBS += $$system(python$${PYTHON_VERSION}-config --libs)
   unix:QMAKE_CXXFLAGS += $$system(python$${PYTHON_VERSION}-config --includes)
 }
 
-INCLUDEPATH += $$[QT_INSTALL_HEADERS]/PythonQt
-
-# check if debug or release
-CONFIG(debug, debug|release) {
-  DEBUG_EXT = _d 
-} else {
-  DEBUG_EXT = 
+#===========================================================#
+#     ______   _______ _   _  ___  _   _    ___ _____       #
+#    |  _ \ \ / /_   _| | | |/ _ \| \ | |  / _ \_   _|      #
+#    | |_) \ V /  | | | |_| | | | |  \| | | | | || |        #
+#    |  __/ | |   | | |  _  | |_| | |\  | | |_| || |        #
+#    |_|    |_|   |_| |_| |_|\___/|_| \_|  \__\_\|_|        #
+#                                                           #
+#===========================================================#
+                                                 
+contains(CONFIG,BUILDING_PYTHONQT){
+	message("BUILDING PYTHONQT")
+}
+!contains(CONFIG,BUILDING_PYTHONQT){
+	INCLUDEPATH += $$[QT_INSTALL_HEADERS]/PythonQt
+	win32::LIBS += -lPythonQt$${DEBUG_EXT}
+	unix::LIBS += -lPythonQt$${DEBUG_EXT}
 }
 
-#win32-msvc*:LIBS += $$PWD/../lib/PythonQt$${DEBUG_EXT}.lib
-#win32-g++:LIBS += $$PWD/../lib/libPythonQt$${DEBUG_EXT}.a
-#unix:LIBS += -L$$OUT_PWD/../lib -L$$OUT_PWD/../../lib -lPythonQt$${DEBUG_EXT}
-
-########################################################################################
-####################   PYTHON_QT_ALL ###################################################
-########################################################################################
+#===============================================================================#
+#     ______   _______ _   _  ___  _   _    ___ _____      _    _     _         #
+#    |  _ \ \ / /_   _| | | |/ _ \| \ | |  / _ \_   _|    / \  | |   | |        #
+#    | |_) \ V /  | | | |_| | | | |  \| | | | | || |     / _ \ | |   | |        #
+#    |  __/ | |   | | |  _  | |_| | |\  | | |_| || |    / ___ \| |___| |___     #
+#    |_|    |_|   |_| |_| |_|\___/|_| \_|  \__\_\|_|   /_/   \_\_____|_____|    #
+#                                                                               #
+#===============================================================================#
+                                                                       
 contains(CONFIG,BUILDING_QTALL){
     message("BUILDING_QTALL")
-    LIBS += -L$$DESTDIR -lPythonQt$${DEBUG_EXT}
-} else {
-win32::LIBS += -lPythonQt_QtAll$${DEBUG_EXT}
-unix::LIBS += -lPythonQt_QtAll$${DEBUG_EXT}
-########################################################################################
-####################   PYTHON_QT  ######################################################
-########################################################################################
-win32::LIBS += -lPythonQt$${DEBUG_EXT}
-unix::LIBS += -lPythonQt$${DEBUG_EXT}
+    win32::LIBS += -L$${DESTDIR}
+    unix::LIBS += -L$${DESTDIR}
+}
+!contains(CONFIG,BUILDING_QTALL){
+    !contains(CONFIG,BUILDING_PYTHONQT){
+        win32::LIBS += -lPythonQt_QtAll$${DEBUG_EXT}
+        unix::LIBS += -lPythonQt_QtAll$${DEBUG_EXT}
+    }
+
 }
 
+
+
diff --git a/cmake/FindPython.cmake b/cmake/FindPython.cmake
deleted file mode 100644
--- a/cmake/FindPython.cmake
+++ /dev/null
@@ -1,189 +0,0 @@
-# - Find python
-# This module searches for both the python interpreter and the python libraries
-# and determines where they are located
-#
-#
-#  PYTHON_FOUND - The requested Python components were found
-#  PYTHON_EXECUTABLE  - path to the Python interpreter
-#  PYTHON_INCLUDE_DIRS - path to the Python header files
-#  PYTHON_LIBRARIES - the libraries to link against for python
-#  PYTHON_VERSION - the python version
-#
-
-#=============================================================================
-# Copyright 2010 Branan Purvine-Riley
-#           2013 Orochimarufan
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-# 
-# * Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-#
-# * Neither the names of Kitware, Inc., the Insight Software Consortium,
-#   nor the names of their contributors may be used to endorse or promote
-#   products derived from this software without specific prior written
-#   permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
-
-IF("3" STREQUAL "${Python_FIND_VERSION_MAJOR}")
-  SET(PYTHON_3_OK "TRUE")
-  SET(PYTHON_2_OK "FALSE") # redundant in version selection code, but skips a FOREACH
-ELSE("3" STREQUAL "${Python_FIND_VERSION_MAJOR}")
-  SET(PYTHON_2_OK "TRUE")
-  # don't set PYTHON_3_OK to false here - if the user specified it we want to search for Python 2 & 3
-ENDIF("3" STREQUAL "${Python_FIND_VERSION_MAJOR}")
-
-# This is  heavily inspired by FindBoost.cmake, with the addition of a second version list to keep
-# python 2 and python 3 separate
-IF(Python_FIND_VERSION_EXACT)
-  SET(_PYTHON_TEST_VERSIONS "${Python_FIND_VERSION_MAJOR}.${Python_FIND_VERSION_MINOR}")
-ELSE(Python_FIND_VERSION_EXACT)
-  # Version lists
-  SET(_PYTHON_3_KNOWN_VERSIONS ${PYTHON_3_ADDITIONAL_VERSIONS}
-    "3.4" "3.3" "3.2" "3.1" "3.0")
-  SET(_PYTHON_2_KNOWN_VERSIONS ${PYTHON_2_ADDITIONAL_VERSIONS}
-    "2.7" "2.6" "2.5" "2.4" "2.3" "2.2" "2.1" "2.0" "1.6" "1.5")
-  SET(_PYTHON_2_TEST_VERSIONS)
-  SET(_PYTHON_3_TEST_VERSIONS)
-  SET(_PYTHON_TEST_VERSIONS)
-  IF(Python_FIND_VERSION)
-    # python 3 versions
-    IF(PYTHON_3_OK)
-      FOREACH(version ${_PYTHON_3_KNOWN_VERSIONS})
-        IF(NOT ${version} VERSION_LESS ${Python_FIND_VERSION})
-        LIST(APPEND _PYTHON_3_TEST_VERSIONS ${version})
-        ENDIF(NOT ${version} VERSION_LESS ${Python_FIND_VERSION})
-      ENDFOREACH(version)
-    ENDIF(PYTHON_3_OK)
-    # python 2 versions
-    IF(PYTHON_2_OK)
-      FOREACH(version ${_PYTHON_2_KNOWN_VERSIONS})
-        IF(NOT ${version} VERSION_LESS ${Python_FIND_VERSION})
-          LIST(APPEND _PYTHON_2_TEST_VERSIONS ${version})
-        ENDIF(NOT ${version} VERSION_LESS ${Python_FIND_VERSION})
-      ENDFOREACH(version)
-    ENDIF(PYTHON_2_OK)
-  # all versions
-  ELSE(Python_FIND_VERSION)
-    IF(PYTHON_3_OK)
-      LIST(APPEND _PYTHON_3_TEST_VERSIONS ${_PYTHON_3_KNOWN_VERSIONS})
-    ENDIF(PYTHON_3_OK)
-    IF(PYTHON_2_OK)
-      LIST(APPEND _PYTHON_2_TEST_VERSIONS ${_PYTHON_2_KNOWN_VERSIONS})
-    ENDIF(PYTHON_2_OK)
-  ENDIF(Python_FIND_VERSION)
-  # fix python3 version flags
-  IF(PYTHON_3_OK)
-    FOREACH(version ${_PYTHON_3_TEST_VERSIONS})
-      IF(${version} VERSION_GREATER 3.1)
-          LIST(APPEND _PYTHON_TEST_VERSIONS "${version}mu" "${version}m" "${version}u" "${version}")
-      ELSE(${version} VERSION_GREATER 3.1)
-        LIST(APPEND _PYTHON_TEST_VERSIONS ${version})
-      ENDIF(${version} VERSION_GREATER 3.1)
-    ENDFOREACH(version)
-  ENDIF(PYTHON_3_OK)
-  IF(PYTHON_2_OK)
-    LIST(APPEND _PYTHON_TEST_VERSIONS ${_PYTHON_2_TEST_VERSIONS})
-  ENDIF(PYTHON_2_OK)
-ENDIF(Python_FIND_VERSION_EXACT)
-
-SET(_PYTHON_EXE_VERSIONS)
-FOREACH(version ${_PYTHON_TEST_VERSIONS})
-  LIST(APPEND _PYTHON_EXE_VERSIONS python${version})
-ENDFOREACH(version ${_PYTHON_TEST_VERSIONS})
-
-IF(WIN32)
-  SET(_PYTHON_REGISTRY_KEYS)
-  FOREACH(version ${_PYTHON_TEST_VERSIONS})
-    LIST(APPEND _PYTHON_REGISTRY_KEYS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${version}\\InstallPath])
-  ENDFOREACH(version ${_PYTHON_TEST_VERSIONS})
-  # this will find any standard windows Python install before it finds anything from Cygwin
-  FIND_PROGRAM(PYTHON_EXECUTABLE NAMES python ${_PYTHON_EXE_VERSIONS} PATHS ${_PYTHON_REGISTRY_KEYS})
-ELSE(WIN32)
-  FIND_PROGRAM(PYTHON_EXECUTABLE NAMES ${_PYTHON_EXE_VERSIONS} PATHS)
-ENDIF(WIN32)
-
-EXECUTE_PROCESS(COMMAND "${PYTHON_EXECUTABLE}" "-c" "from sys import *; stdout.write('%i.%i.%i' % version_info[:3])" OUTPUT_VARIABLE PYTHON_VERSION)
-
-# Get our library path and include directory from python
-IF(${PYTHON_VERSION} VERSION_GREATER 3.1)
-  SET(_PYTHON_SYSCONFIG "sysconfig")
-  SET(_PYTHON_SC_INCLUDE "sysconfig.get_path('include')")
-ELSE()
-  SET(_PYTHON_SYSCONFIG "distutils.sysconfig")
-  SET(_PYTHON_SC_INCLUDE "distutils.sysconfig.get_python_inc()")
-ENDIF()
-
-IF(WIN32)
-  EXECUTE_PROCESS(
-    COMMAND "${PYTHON_EXECUTABLE}" -c "import ${_PYTHON_SYSCONFIG}; import sys; sys.stdout.write(${_PYTHON_SYSCONFIG}.get_config_var('prefix'))"
-    OUTPUT_VARIABLE _PYTHON_PREFIX
-  )
-  EXECUTE_PROCESS(
-    COMMAND "${PYTHON_EXECUTABLE}" -c "import ${_PYTHON_SYSCONFIG}; import sys; sys.stdout.write(${_PYTHON_SYSCONFIG}.get_config_var('py_version_nodot'))"
-    OUTPUT_VARIABLE _PYTHON_VERSION_MAJOR
-  )
-  SET(_PYTHON_LIBRARY_PATH ${_PYTHON_PREFIX}/libs)
-  SET(_PYTHON_LIBRARY_NAME libpython${_PYTHON_VERSION_MAJOR}.a)
-ELSE(WIN32)
-  EXECUTE_PROCESS(
-    COMMAND "${PYTHON_EXECUTABLE}" -c "import ${_PYTHON_SYSCONFIG}; import sys; sys.stdout.write(${_PYTHON_SYSCONFIG}.get_config_var('LIBDIR'))"
-    OUTPUT_VARIABLE _PYTHON_LIBRARY_PATH
-  )
-  EXECUTE_PROCESS(
-    COMMAND "${PYTHON_EXECUTABLE}" -c "import ${_PYTHON_SYSCONFIG}; import sys; sys.stdout.write(${_PYTHON_SYSCONFIG}.get_config_var('LDLIBRARY'))"
-    OUTPUT_VARIABLE _PYTHON_LIBRARY_NAME
-  )
-  # Multiarch
-  EXECUTE_PROCESS(
-    COMMAND "${PYTHON_EXECUTABLE}" -c "import ${_PYTHON_SYSCONFIG}; import sys; sys.stdout.write(${_PYTHON_SYSCONFIG}.get_config_vars().get('MULTIARCH', 'PYTHON_LIBRARY_MULTIARCH-NOTFOUND'))"
-    OUTPUT_VARIABLE _PYTHON_LIBRARY_MULTIARCH
-  )
-  IF(NOT "${_PYTHON_LIBRARY_MULTIARCH}" STREQUAL "PYTHON_LIBRARY_MULTIARCH-NOTFOUND")
-    SET(_PYTHON_LIBRARY_PATH_X ${_PYTHON_LIBRARY_PATH})
-    SET(_PYTHON_LIBRARY_PATH)
-    FOREACH(path ${_PYTHON_LIBRARY_PATH_X})
-      LIST(APPEND _PYTHON_LIBRARY_PATH "${path}/${_PYTHON_LIBRARY_MULTIARCH}" "${path}")
-    ENDFOREACH(path)
-  ENDIF(NOT "${_PYTHON_LIBRARY_MULTIARCH}" STREQUAL "PYTHON_LIBRARY_MULTIARCH-NOTFOUND")
-ENDIF(WIN32)
-EXECUTE_PROCESS(COMMAND "${PYTHON_EXECUTABLE}"
-  "-c" "import ${_PYTHON_SYSCONFIG}; import sys; sys.stdout.write(${_PYTHON_SC_INCLUDE})"
-  OUTPUT_VARIABLE PYTHON_INCLUDE_DIR
-)
-
-FIND_FILE(PYTHON_LIBRARY ${_PYTHON_LIBRARY_NAME} PATHS ${_PYTHON_LIBRARY_PATH} NO_DEFAULT_PATH)
-FIND_FILE(PYTHON_HEADER "Python.h" PATHS ${PYTHON_INCLUDE_DIR} NO_DEFAULT_PATH)
-
-set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
-set(PYTHON_LIBRARIES ${PYTHON_LIBRARY})
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Python
-  REQUIRED_VARS PYTHON_EXECUTABLE PYTHON_HEADER PYTHON_LIBRARY
-  VERSION_VAR PYTHON_VERSION
-)
-
-MARK_AS_ADVANCED(PYTHON_EXECUTABLE)
-MARK_AS_ADVANCED(PYTHON_INCLUDE_DIRS)
-MARK_AS_ADVANCED(PYTHON_LIBRARIES)
-MARK_AS_ADVANCED(PYTHON_VERSION)
-
diff --git a/cmake/PythonQt_Qt_4x.cmake b/cmake/PythonQt_Qt_4x.cmake
deleted file mode 100644
--- a/cmake/PythonQt_Qt_4x.cmake
+++ /dev/null
@@ -1,53 +0,0 @@
-
-set(minimum_required_qt_version "4.6.2")
-find_package(Qt4 REQUIRED)
-
-set(found_qt_version ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH})
-
-if(${found_qt_version} VERSION_LESS ${minimum_required_qt_version})
-	message(FATAL_ERROR "error: PythonQt requires Qt >= ${minimum_required_qt_version} -- you cannot use Qt ${found_qt_version}.")
-endif()
-
-# qt5_use_modules port
-macro(qt_use_modules _target _link_type)
-	if(NOT TARGET ${_target})
-		message(FATAL_ERROR "The first argument to qt_use_modules must be an existing target.")
-	endif()
-	if("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" )
-		set(_qt4_modules ${ARGN})
-		set(_qt4_link_type ${_link_type})
-	else()
-		set(_qt4_modules ${_link_type} ${ARGN})
-	endif()
-
-	if("${_qt4_modules}" STREQUAL "")
-		message(FATAL_ERROR "qt_use_modules requires at least one Qt module to use.")
-	endif()
-
-	foreach(_module5 ${_qt4_modules})
-		string(TOUPPER ${_module5} _module)
-		if(NOT QT_QT${_module}_FOUND)
-			message(FATAL_ERROR "qt_use_modules(): QT_QT${_module} *not* FOUND.")
-		endif()
-		set(QT_USE_QT${_module} 1)
-	endforeach()
-
-	include(${QT_USE_FILE})
-	target_link_libraries(${_target} ${_qt4_link_type} ${QT_LIBRARIES})
-	set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${QT_INCLUDE_DIRS})
-	set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${QT_COMPILE_DEFINITIONS})
-	set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE QT_NO_DEBUG)
-
-	if(Qt_POSITION_INDEPENDENT_CODE)
-		set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt_POSITION_INDEPENDENT_CODE})
-	endif()
-endmacro()
-
-# aliases to make it work across Qt4/Qt5
-macro(qt_add_resources)
-  qt4_add_resources(${ARGN})
-endmacro()
-
-macro(qt_wrap_cpp)
-  qt4_wrap_cpp(${ARGN})
-endmacro()
diff --git a/cmake/PythonQt_Qt_5x.cmake b/cmake/PythonQt_Qt_5x.cmake
deleted file mode 100644
--- a/cmake/PythonQt_Qt_5x.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-find_package(Qt5Core REQUIRED)
-
-# aliases
-macro(qt_use_modules)
-  qt5_use_modules(${ARGN})
-endmacro()
-
-macro(qt_wrap_cpp)
-  qt5_wrap_cpp(${ARGN})
-endmacro()
-
-macro(qt_add_resources)
-  qt5_add_resources(${ARGN})
-endmacro()
-
-# version
-set(QT_VERSION_MAJOR ${Qt5Core_VERSION_MAJOR})
-set(QT_VERSION_MINOR ${Qt5Core_VERSION_MINOR})
-set(QT_VERSION_PATCH ${Qt5Core_VERSION_PATCH})
diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in
deleted file mode 100644
--- a/cmake/cmake_uninstall.cmake.in
+++ /dev/null
@@ -1,24 +0,0 @@
-cmake_policy(SET CMP0007 OLD)
-
-if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-	message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
-endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-
-file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
-string(REGEX REPLACE "\n" ";" files "${files}")
-list(REVERSE files)
-foreach (file ${files})
-	message(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
-	if (EXISTS "$ENV{DESTDIR}${file}")
-		execute_process(
-			COMMAND @CMAKE_COMMAND@ -E remove "$ENV{DESTDIR}${file}"
-			OUTPUT_VARIABLE rm_out
-			RESULT_VARIABLE rm_retval
-		)
-		if(NOT ${rm_retval} EQUAL 0)
-			message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
-		endif (NOT ${rm_retval} EQUAL 0)
-	else (EXISTS "$ENV{DESTDIR}${file}")
-		message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
-	endif (EXISTS "$ENV{DESTDIR}${file}")
-endforeach(file)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
deleted file mode 100644
--- a/examples/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_subdirectory(NicePyConsole)
-
diff --git a/examples/NicePyConsole/CMakeLists.txt b/examples/NicePyConsole/CMakeLists.txt
deleted file mode 100644
--- a/examples/NicePyConsole/CMakeLists.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-project(NicePyConsole)
-
-SET(HEADERS
-	SimpleConsole.h
-	NicePyConsole.h
-	PygmentsHighlighter.h
-	PythonCompleter.h
-	PythonCompleterPopup.h
-)
-
-SET(SOURCES
-	SimpleConsole.cpp
-	NicePyConsole.cpp
-	main.cpp
-	PygmentsHighlighter.cpp
-	PythonCompleter.cpp
-	PythonCompleterPopup.cpp
-)
-
-SET(FILES
-	PygmentsHighlighter.py
-	PythonCompleter.py
-	module_completion.py
-)
-
-SET(DIRS
-	pygments
-)
-
-qt_wrap_cpp(GEN_MOC ${HEADERS})
-
-add_executable(NicePyConsole ${SOURCES} ${GEN_MOC})
-if(PythonQt_Qt5)
-	qt_use_modules(NicePyConsole Core Gui Widgets)
-else()
-	qt_use_modules(NicePyConsole Core Gui)
-endif()
-
-target_link_libraries(NicePyConsole ${PythonQt} ${PythonQt_QtAll} ${PYTHON_LIBRARIES})
-
-foreach(FILE ${FILES})
-	SET(OUT "${CMAKE_CURRENT_BINARY_DIR}/${FILE}")
-	SET(IN "${CMAKE_CURRENT_SOURCE_DIR}/${FILE}")
-	add_custom_command(OUTPUT "${OUT}"
-		COMMAND "${CMAKE_COMMAND}" -E copy "${IN}" "${OUT}"
-		MAIN_DEPENDENCY "${IN}"
-	)
-	add_dependencies(NicePyConsole "${OUT}")
-endforeach()
-
-foreach(DIR ${DIRS})
-	SET(OUT "${CMAKE_CURRENT_BINARY_DIR}/${DIR}")
-	SET(IN "${CMAKE_CURRENT_SOURCE_DIR}/${DIR}")
-	add_custom_command(OUTPUT "${OUT}"
-		COMMAND "${CMAKE_COMMAND}" -E copy_directory "${IN}" "${OUT}"
-		MAIN_DEPENDENCY "${IN}"
-	)
-	add_dependencies(NicePyConsole "${OUT}")
-endforeach()
diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt
deleted file mode 100644
--- a/extensions/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_subdirectory(PythonQt_QtAll)
-
diff --git a/extensions/PythonQt_QtAll/CMakeLists.txt b/extensions/PythonQt_QtAll/CMakeLists.txt
deleted file mode 100644
--- a/extensions/PythonQt_QtAll/CMakeLists.txt
+++ /dev/null
@@ -1,193 +0,0 @@
-project(PythonQt_QtAll)
-
-# Bindings
-SET(HEADERS
-	PythonQt_QtAll.h
-)
-
-SET(SOURCES
-	PythonQt_QtAll.cpp
-)
-
-#-------------------------------------------------------------------
-# Generated stuff
-SET(GEN ../../generated_cpp${generated_cpp_suffix})
-SET(GEN_HEADERS)
-SET(GEN_SOURCES)
-
-foreach(MODULE core gui network opengl sql svg uitools webkit xml)
-	SET(MODULE_TROLL com_trolltech_qt_${MODULE})
-	SET(MODULE_BASE ${GEN}/${MODULE_TROLL}/${MODULE_TROLL})
-	FILE(GLOB HFILES ${MODULE_BASE}*.h)
-	FILE(GLOB CFILES ${MODULE_BASE}*.cpp)
-	LIST(APPEND GEN_HEADERS ${HFILES})
-	LIST(APPEND GEN_SOURCES ${CFILES})
-endforeach()
-
-## Core
-#LIST(APPEND HEADERS
-#	${GEN}/com_trolltech_qt_core/com_trolltech_qt_core0.h
-#	${GEN}/com_trolltech_qt_core/com_trolltech_qt_core1.h
-#	${GEN}/com_trolltech_qt_core/com_trolltech_qt_core2.h
-#)
-
-#LIST(APPEND SOURCES
-#	${GEN}/com_trolltech_qt_core/com_trolltech_qt_core0.cpp
-#	${GEN}/com_trolltech_qt_core/com_trolltech_qt_core1.cpp
-#	${GEN}/com_trolltech_qt_core/com_trolltech_qt_core2.cpp
-#	${GEN}/com_trolltech_qt_core/com_trolltech_qt_core_init.cpp
-#)
-
-## Gui
-#LIST(APPEND HEADERS
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui0.h
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui1.h
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui2.h
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui3.h
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui4.h
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui5.h
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui6.h
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui7.h
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui8.h
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui9.h
-#)
-
-#LIST(APPEND SOURCES
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui0.cpp
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui1.cpp
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui2.cpp
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui3.cpp
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui4.cpp
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui5.cpp
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui6.cpp
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui7.cpp
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui8.cpp
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui9.cpp
-#	${GEN}/com_trolltech_qt_gui/com_trolltech_qt_gui_init.cpp
-#)
-
-## Network
-#LIST(APPEND HEADERS
-#	${GEN}/com_trolltech_qt_network/com_trolltech_qt_network0.h
-#)
-
-#LIST(APPEND SOURCES
-#	${GEN}/com_trolltech_qt_network/com_trolltech_qt_network0.cpp
-#	${GEN}/com_trolltech_qt_network/com_trolltech_qt_network_init.cpp
-#)
-
-## OpenGL
-#LIST(APPEND HEADERS
-#	${GEN}/com_trolltech_qt_opengl/com_trolltech_qt_opengl0.h
-#)
-
-#LIST(APPEND SOURCES
-#	${GEN}/com_trolltech_qt_opengl/com_trolltech_qt_opengl0.cpp
-#	${GEN}/com_trolltech_qt_opengl/com_trolltech_qt_opengl_init.cpp
-#)
-
-## Sql
-#LIST(APPEND HEADERS
-#	${GEN}/com_trolltech_qt_sql/com_trolltech_qt_sql0.h
-#)
-
-#LIST(APPEND SOURCES
-#	${GEN}/com_trolltech_qt_sql/com_trolltech_qt_sql0.cpp
-#	${GEN}/com_trolltech_qt_sql/com_trolltech_qt_sql_init.cpp
-#)
-
-## Svg
-#LIST(APPEND HEADERS
-#	${GEN}/com_trolltech_qt_svg/com_trolltech_qt_svg0.h
-#)
-
-#LIST(APPEND SOURCES
-#	${GEN}/com_trolltech_qt_svg/com_trolltech_qt_svg0.cpp
-#	${GEN}/com_trolltech_qt_svg/com_trolltech_qt_svg_init.cpp
-#)
-
-## uitools
-#LIST(APPEND HEADERS
-#	${GEN}/com_trolltech_qt_uitools/com_trolltech_qt_uitools0.h
-#)
-
-#LIST(APPEND SOURCES
-#	${GEN}/com_trolltech_qt_uitools/com_trolltech_qt_uitools0.cpp
-#	${GEN}/com_trolltech_qt_uitools/com_trolltech_qt_uitools_init.cpp
-#)
-
-## WebKit
-#LIST(APPEND HEADERS
-#	${GEN}/com_trolltech_qt_webkit/com_trolltech_qt_webkit0.h
-#)
-
-#LIST(APPEND SOURCES
-#	${GEN}/com_trolltech_qt_webkit/com_trolltech_qt_webkit0.cpp
-#	${GEN}/com_trolltech_qt_webkit/com_trolltech_qt_webkit_init.cpp
-#)
-
-## Xml
-#LIST(APPEND HEADERS
-#	${GEN}/com_trolltech_qt_xml/com_trolltech_qt_xml0.h
-#)
-
-#LIST(APPEND SOURCES
-#	${GEN}/com_trolltech_qt_xml/com_trolltech_qt_xml0.cpp
-#	${GEN}/com_trolltech_qt_xml/com_trolltech_qt_xml_init.cpp
-#)
-
-#-------------------------------------------------------------------
-# Build
-set(PythonQt_QtAll ${PythonQt}_QtAll CACHE INTERNAL "")
-
-include_directories(../../src)
-add_definitions(-DPYTHONQT_QTALL_EXPORTS)
-qt_wrap_cpp(GEN_MOC ${GEN_HEADERS})
-
-SET(QT Core Gui Network OpenGL Sql Svg UiTools WebKit Xml)
-if(PythonQt_Qt5)
-	LIST(APPEND QT Widgets WebKitWidgets)
-endif()
-
-
-add_library(${PythonQt_QtAll} SHARED ${SOURCES} ${HEADERS} ${GEN_SOURCES} ${GEN_MOC})
-qt_use_modules(${PythonQt_QtAll} ${QT})
-
-target_link_libraries(${PythonQt_QtAll} ${PythonQt} ${PYTHON_LIBRARIES})
-
-set_target_properties(${PythonQt_QtAll} PROPERTIES PUBLIC_HEADER "${HEADERS}")
-
-install(TARGETS ${PythonQt_QtAll} EXPORT ${PythonQt_QtAll}Targets COMPONENT QtAll
-				RUNTIME DESTINATION bin
-				LIBRARY DESTINATION lib
-				ARCHIVE DESTINATION lib
-				PUBLIC_HEADER DESTINATION include/PythonQt)
-
-#-----------------------------------------------------------------------------
-# Export CMake Config
-
-if(WIN32 AND NOT CYGWIN)
-	set(LIB_CMAKE_PATH "cmake")
-else()
-	set(LIB_CMAKE_PATH "lib/cmake/${PythonQt_QtAll}")
-endif()
-
-export(TARGETS ${PythonQt_QtAll} ${PythonQt} FILE "${PROJECT_BINARY_DIR}/${PythonQt_QtAll}Targets.cmake")
-export(PACKAGE ${PythonQt_QtAll})
-
-# build tree
-set(PythonQt_EXPORT_LOCAL ON)
-set(INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
-configure_file(PythonQt_QtAllConfig.cmake.in "${PROJECT_BINARY_DIR}/${PythonQt_QtAll}Config.cmake" @ONLY)
-# install tree
-set(PythonQt_EXPORT_LOCAL OFF)
-set(INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/PythonQt")
-configure_file(PythonQt_QtAllConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PythonQt_QtAll}Config.cmake" @ONLY)
-# both
-configure_file(PythonQt_QtAllConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/${PythonQt_QtAll}ConfigVersion.cmake" @ONLY)
-
-install(EXPORT ${PythonQt_QtAll}Targets DESTINATION "${LIB_CMAKE_PATH}" COMPONENT QtAll-dev)
-install(FILES ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PythonQt_QtAll}Config.cmake
-			  ${PROJECT_BINARY_DIR}/${PythonQt_QtAll}ConfigVersion.cmake
-		DESTINATION "${LIB_CMAKE_PATH}" COMPONENT QtAll-dev)
-
diff --git a/extensions/PythonQt_QtAll/PythonQt_QtAll.pro b/extensions/PythonQt_QtAll/PythonQt_QtAll.pro
--- a/extensions/PythonQt_QtAll/PythonQt_QtAll.pro
+++ b/extensions/PythonQt_QtAll/PythonQt_QtAll.pro
@@ -4,7 +4,6 @@ TEMPLATE = lib
 
 DESTDIR    = ../../lib
 
-include ( ../../build/common.prf )  
 CONFIG+=BUILDING_QTALL
 include ( ../../build/pythonqt.prf )
 
diff --git a/extensions/PythonQt_QtAll/PythonQt_QtAllConfig.cmake.in b/extensions/PythonQt_QtAll/PythonQt_QtAllConfig.cmake.in
deleted file mode 100644
--- a/extensions/PythonQt_QtAll/PythonQt_QtAllConfig.cmake.in
+++ /dev/null
@@ -1,30 +0,0 @@
-# - Config file for the PythonQt package
-# It defines the following variables
-#  PythonQt_QtAll              - the PythonQt QtAll target
-#  PythonQt_QtAll_INCLUDE_DIRS - include directories for PythonQt
-#  PythonQt_QtAll_LIBRARIES    - libraries to link against
-#  PythonQt_QtAll_QT           - linked Qt modules
-
-set(PythonQt_QtAll @PythonQt_QtAll@)
-set(PythonQt_QtAll_QT @QT@)
-
-set(__PYTHONQT_LOCAL @PythonQt_EXPORT_LOCAL@)
-if(NOT __PYTHONQT_LOCAL)
-	find_package(@PythonQt@)
-endif()
-
-# Compute paths
-get_filename_component(PYTHONQT_QTALL_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-set(PythonQt_QtAll_INCLUDE_DIRS "@INCLUDE_DIRS@")
-
-# Our library dependencies (contains definitions for IMPORTED targets)
-if(NOT TARGET @PythonQt_QtAll@)
-  include("${PYTHONQT_QTALL_CMAKE_DIR}/@PythonQt_QtAll@Targets.cmake")
-endif()
-
-if(__PYTHONQT_LOCAL)
-	find_package(@PythonQt@)
-endif()
-
-# These are IMPORTED targets created by @PythonQt_QtAll@Targets.cmake
-set(PythonQt_QtAll_LIBRARIES @PythonQt_QtAll@)
diff --git a/extensions/PythonQt_QtAll/PythonQt_QtAllConfigVersion.cmake.in b/extensions/PythonQt_QtAll/PythonQt_QtAllConfigVersion.cmake.in
deleted file mode 100644
--- a/extensions/PythonQt_QtAll/PythonQt_QtAllConfigVersion.cmake.in
+++ /dev/null
@@ -1,11 +0,0 @@
-set(PACKAGE_VERSION "@PythonQt_VERSION@")
-
-# Check whether the requested PACKAGE_FIND_VERSION is compatible
-if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
-  set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else()
-  set(PACKAGE_VERSION_COMPATIBLE TRUE)
-  if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
-	set(PACKAGE_VERSION_EXACT TRUE)
-  endif()
-endif()
diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
deleted file mode 100644
--- a/generator/CMakeLists.txt
+++ /dev/null
@@ -1,162 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-#-----------------------------------------------------------------------------
-project(PythonQtGenerator)
-#-----------------------------------------------------------------------------
-
-include(CTestUseLaunchers OPTIONAL)
-
-#-----------------------------------------------------------------------------
-# Setup Qt
-
-set(minimum_required_qt_version "4.6.2")
-
-find_package(Qt4)
-
-if(QT4_FOUND)
-
-  set(found_qt_version ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH})
-
-  if(${found_qt_version} VERSION_LESS ${minimum_required_qt_version})
-      message(FATAL_ERROR "error: PythonQt requires Qt >= ${minimum_required_qt_version} -- you cannot use Qt ${found_qt_version}.")
-  endif()
-  
-  set(QT_USE_QTXML ON)
-  
-  include(${QT_USE_FILE})
-else()
-  message(FATAL_ERROR "error: Qt4 was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable")
-endif()
-
-#-----------------------------------------------------------------------------
-# Sources
-
-set(sources
-  parser/ast.cpp
-  parser/binder.cpp
-  parser/class_compiler.cpp
-  parser/codemodel.cpp
-  parser/codemodel_finder.cpp
-  parser/compiler_utils.cpp
-  parser/control.cpp
-  parser/declarator_compiler.cpp
-  parser/default_visitor.cpp
-  parser/dumptree.cpp
-  parser/lexer.cpp
-  parser/list.cpp
-  parser/name_compiler.cpp
-  parser/parser.cpp
-  parser/smallobject.cpp
-  parser/tokens.cpp
-  parser/type_compiler.cpp
-  parser/visitor.cpp
-  
-  abstractmetabuilder.cpp
-  abstractmetalang.cpp
-  asttoxml.cpp
-  customtypes.cpp
-  fileout.cpp
-  generator.cpp
-  generatorset.cpp
-  generatorsetqtscript.cpp
-  main.cpp
-  metajava.cpp
-  metaqtscriptbuilder.cpp
-  metaqtscript.cpp
-  prigenerator.cpp
-  reporthandler.cpp
-  setupgenerator.cpp
-  shellgenerator.cpp
-  shellheadergenerator.cpp
-  shellimplgenerator.cpp
-  typeparser.cpp
-  typesystem.cpp
-  )
-  
-#-----------------------------------------------------------------------------
-# List headers.  This list is used for the install command.
-
-set(headers
-  )
-
-#-----------------------------------------------------------------------------
-# Headers that should run through moc
-
-set(moc_sources
-  fileout.h
-  generator.h
-  generatorset.h
-  generatorsetqtscript.h
-  prigenerator.h
-  setupgenerator.h
-  shellgenerator.h
-  shellheadergenerator.h
-  shellimplgenerator.h
-  )
-  
-#-----------------------------------------------------------------------------
-# UI files
-
-set(ui_sources )
-
-#-----------------------------------------------------------------------------
-# Resources
-
-set(qrc_sources
-  generator.qrc
-  )
-
-#-----------------------------------------------------------------------------
-# Do wrapping
-qt4_wrap_cpp(gen_moc_sources ${moc_sources})
-qt4_wrap_ui(gen_ui_sources ${ui_sources})
-qt4_add_resources(gen_qrc_sources ${qrc_sources})
-
-#-----------------------------------------------------------------------------
-# Copy file expected by the generator and specify install rules
-
-file(GLOB files_to_copy RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "build_*.txt" "typesystem_*.xml")
-list(APPEND files_to_copy qtscript_masterinclude.h parser/rpp/pp-qt-configuration)
-foreach(file ${files_to_copy})
-  configure_file(
-    ${file}
-    ${CMAKE_CURRENT_BINARY_DIR}/${file}
-    COPYONLY
-    )
-  get_filename_component(destination_dir ${file} PATH)
-  install(FILES ${file} DESTINATION bin/${destination_dir})
-endforeach()
-
-#-----------------------------------------------------------------------------
-# Build the library
-
-SOURCE_GROUP("Resources" FILES
-  ${qrc_sources}
-  ${ui_sources}
-  ${files_to_copy}
-  )
-
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/parser
-  ${CMAKE_CURRENT_SOURCE_DIR}/parser/rpp
-  )
-  
-add_definitions(-DRXX_ALLOCATOR_INIT_0)
-  
-add_executable(${PROJECT_NAME}
-  ${sources}
-  ${gen_moc_sources}
-  ${gen_ui_sources}
-  ${gen_qrc_sources}
-)
-
-target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
-
-#-----------------------------------------------------------------------------
-# Install library (on windows, put the dll in 'bin' and the archive in 'lib')
-
-install(TARGETS ${PROJECT_NAME}
-        RUNTIME DESTINATION bin
-        LIBRARY DESTINATION lib
-        ARCHIVE DESTINATION lib)
diff --git a/generator_50/CMakeLists.txt b/generator_50/CMakeLists.txt
deleted file mode 100644
--- a/generator_50/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-project(PythonQtGenerator)
-
-# straight qmake port
-SET(HEADERS)
-SET(SOURCES)
-SET(QT)
-SET(RESOURCES)
-SET(INCLUDEPATH)
-SET(DEFINES)
-
-include(${CMAKE_CURRENT_SOURCE_DIR}/generator_50.cmake)
-
-LIST(APPEND HEADERS
-	#generatorscript.h
-	generatorsetqtscript.h
-	metaqtscriptbuilder.h
-	metaqtscript.h
-	shellgenerator.h
-	shellimplgenerator.h
-	shellheadergenerator.h
-	setupgenerator.h
-)
-
-LIST(APPEND SOURCES
-	generatorsetqtscript.cpp
-	metaqtscriptbuilder.cpp
-	metaqtscript.cpp
-	shellgenerator.cpp
-	shellimplgenerator.cpp
-	shellheadergenerator.cpp
-	setupgenerator.cpp
-)
-
-include_directories(${INCLUDEPATH})
-add_definitions(${DEFINITIONS})
-qt_add_resources(GEN_QRC ${RESOURCES})
-qt_wrap_cpp(GEN_MOC ${HEADERS})
-
-add_executable(pythonqt_generator ${SOURCES} ${GEN_QRC} ${GEN_MOC})
-qt_use_modules(pythonqt_generator ${QT})
diff --git a/generator_50/generator_50.cmake b/generator_50/generator_50.cmake
deleted file mode 100644
--- a/generator_50/generator_50.cmake
+++ /dev/null
@@ -1,47 +0,0 @@
-
-IF(NOT GENERATORPATH)
-	SET(GENERATORPATH ${CMAKE_CURRENT_LIST_DIR})
-ENDIF()
-
-LIST(APPEND INCLUDEPATH ${GENERATORPATH})
-LIST(APPEND INCLUDEPATH ${GENERATORPATH}/.)
-LIST(APPEND INCLUDEPATH ${GENERATORPATH}/../common)
-
-LIST(APPEND RESOURCES ${GENERATORPATH}/generator.qrc)
-
-include(${GENERATORPATH}/parser/rxx.cmake)
-include(${GENERATORPATH}/parser/rpp/rpp.cmake)
-
-LIST(APPEND HEADERS
-	${GENERATORPATH}/generator.h
-    ${GENERATORPATH}/main.h
-    ${GENERATORPATH}/reporthandler.h
-    ${GENERATORPATH}/typeparser.h
-    ${GENERATORPATH}/typesystem.h
-    ${GENERATORPATH}/asttoxml.h
-    ${GENERATORPATH}/fileout.h
-    ${GENERATORPATH}/generatorset.h
-    ${GENERATORPATH}/metajava.h
-    ${GENERATORPATH}/customtypes.h
-    ${GENERATORPATH}/abstractmetabuilder.h
-    ${GENERATORPATH}/abstractmetalang.h
-    ${GENERATORPATH}/prigenerator.h
-)
-
-LIST(APPEND SOURCES
-    ${GENERATORPATH}/generator.cpp
-    ${GENERATORPATH}/main.cpp
-    ${GENERATORPATH}/reporthandler.cpp
-    ${GENERATORPATH}/typeparser.cpp
-    ${GENERATORPATH}/typesystem.cpp
-    ${GENERATORPATH}/asttoxml.cpp
-    ${GENERATORPATH}/fileout.cpp
-    ${GENERATORPATH}/generatorset.cpp
-    ${GENERATORPATH}/metajava.cpp
-    ${GENERATORPATH}/customtypes.cpp
-    ${GENERATORPATH}/abstractmetabuilder.cpp
-    ${GENERATORPATH}/abstractmetalang.cpp
-    ${GENERATORPATH}/prigenerator.cpp
-)
-
-LIST(APPEND QT Core Xml)
diff --git a/generator_50/parser/rpp/rpp.cmake b/generator_50/parser/rpp/rpp.cmake
deleted file mode 100644
--- a/generator_50/parser/rpp/rpp.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-LIST(APPEND SOURCES
-	${RXXPATH}/rpp/preprocessor.cpp
-)
-
-LIST(APPEND HEADERS
-	${RXXPATH}/rpp/pp-cctype.h
-	${RXXPATH}/rpp/pp-engine-bits.h
-	${RXXPATH}/rpp/pp-engine.h
-	${RXXPATH}/rpp/pp-environment.h
-	${RXXPATH}/rpp/pp-fwd.h
-	${RXXPATH}/rpp/pp-internal.h
-	${RXXPATH}/rpp/pp-iterator.h
-	${RXXPATH}/rpp/pp-macro-expander.h
-	${RXXPATH}/rpp/pp-macro.h
-	${RXXPATH}/rpp/pp-scanner.h
-	${RXXPATH}/rpp/pp-string.h
-	${RXXPATH}/rpp/pp-symbol.h
-	${RXXPATH}/rpp/pp.h
-	${RXXPATH}/rpp/preprocessor.h
-)
-
-LIST(APPEND INCLUDEPATH ${RXXPATH}/rpp)
diff --git a/generator_50/parser/rxx.cmake b/generator_50/parser/rxx.cmake
deleted file mode 100644
--- a/generator_50/parser/rxx.cmake
+++ /dev/null
@@ -1,55 +0,0 @@
-
-IF(NOT RXXPATH)
-	SET(RXXPATH ${CMAKE_CURRENT_LIST_DIR})
-ENDIF()
-
-LIST(APPEND INCLUDEPATH ${RXXPATH})
-
-LIST(APPEND DEFINES -DRXX_ALLOCATOR_INIT_0)
-
-LIST(APPEND HEADERS
-	${RXXPATH}/ast.h
-	${RXXPATH}/lexer.h
-	${RXXPATH}/list.h
-	${RXXPATH}/parser.h
-	${RXXPATH}/rxx_allocator.h
-	${RXXPATH}/rpp-allocator.h
-	${RXXPATH}/smallobject.h
-	${RXXPATH}/tokens.h
-	${RXXPATH}/symbol.h
-	${RXXPATH}/control.h
-	${RXXPATH}/visitor.h
-	${RXXPATH}/default_visitor.h
-	${RXXPATH}/dumptree.h
-	${RXXPATH}/binder.h
-	${RXXPATH}/codemodel.h
-	${RXXPATH}/codemodel_pointer.h
-	${RXXPATH}/codemodel_fwd.h
-	${RXXPATH}/type_compiler.h
-	${RXXPATH}/name_compiler.h
-	${RXXPATH}/declarator_compiler.h
-	${RXXPATH}/class_compiler.h
-	${RXXPATH}/codemodel_finder.h
-	${RXXPATH}/compiler_utils.h
-)
-
-LIST(APPEND SOURCES
-	${RXXPATH}/ast.cpp
-    ${RXXPATH}/lexer.cpp
-    ${RXXPATH}/list.cpp
-    ${RXXPATH}/parser.cpp
-    ${RXXPATH}/smallobject.cpp
-    ${RXXPATH}/control.cpp
-    ${RXXPATH}/visitor.cpp
-    ${RXXPATH}/default_visitor.cpp
-    ${RXXPATH}/dumptree.cpp
-    ${RXXPATH}/tokens.cpp
-    ${RXXPATH}/binder.cpp
-    ${RXXPATH}/codemodel.cpp
-    ${RXXPATH}/type_compiler.cpp
-    ${RXXPATH}/name_compiler.cpp
-    ${RXXPATH}/declarator_compiler.cpp
-    ${RXXPATH}/class_compiler.cpp
-    ${RXXPATH}/codemodel_finder.cpp
-    ${RXXPATH}/compiler_utils.cpp
-)
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
deleted file mode 100644
--- a/src/CMakeLists.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-project(PythonQt_Core)
-
-#-----------------------------------------------------------------------------
-# Sources
-
-set(SOURCES
-	PythonQtClassInfo.cpp
-	PythonQtClassWrapper.cpp
-	PythonQtConversion.cpp
-	PythonQt.cpp
-	PythonQtImporter.cpp
-	PythonQtInstanceWrapper.cpp
-	PythonQtMethodInfo.cpp
-	PythonQtMisc.cpp
-	PythonQtObjectPtr.cpp
-	PythonQtQFileImporter.cpp
-	PythonQtSignalReceiver.cpp
-	PythonQtSlot.cpp
-	PythonQtSignal.cpp
-	PythonQtStdDecorators.cpp
-	PythonQtStdIn.cpp
-	PythonQtStdOut.cpp
-	gui/PythonQtScriptingConsole.cpp
-
-	../generated_cpp${generated_cpp_suffix}/PythonQt_QtBindings.cpp
-
-	../generated_cpp${generated_cpp_suffix}/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin0.cpp
-	../generated_cpp${generated_cpp_suffix}/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin_init.cpp
-	../generated_cpp${generated_cpp_suffix}/com_trolltech_qt_gui_builtin/com_trolltech_qt_gui_builtin0.cpp
-	../generated_cpp${generated_cpp_suffix}/com_trolltech_qt_gui_builtin/com_trolltech_qt_gui_builtin_init.cpp
-)
-
-#-----------------------------------------------------------------------------
-# List headers.	This is list is used for the install command.
-
-set(HEADERS
-	PythonQtClassInfo.h
-	PythonQtClassWrapper.h
-	PythonQtConversion.h
-	PythonQtCppWrapperFactory.h
-	PythonQtDoc.h
-	PythonQt.h
-	PythonQtImporter.h
-	PythonQtImportFileInterface.h
-	PythonQtInstanceWrapper.h
-	PythonQtMethodInfo.h
-	PythonQtMisc.h
-	PythonQtObjectPtr.h
-	PythonQtQFileImporter.h
-	PythonQtSignalReceiver.h
-	PythonQtSlot.h
-	PythonQtSignal.h
-	PythonQtStdDecorators.h
-	PythonQtStdIn.h
-	PythonQtStdOut.h
-	PythonQtSystem.h
-	PythonQtVariants.h
-	PythonQtPythonInclude.h
-	../generated_cpp${generated_cpp_suffix}/PythonQt_QtBindings.h
-)
-
-#-----------------------------------------------------------------------------
-# Headers that should run through moc
-
-set(SOURCES_MOC
-	PythonQt.h
-	PythonQtSignalReceiver.h
-	PythonQtStdDecorators.h
-	gui/PythonQtScriptingConsole.h
-
-	../generated_cpp${generated_cpp_suffix}/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin0.h
-	../generated_cpp${generated_cpp_suffix}/com_trolltech_qt_gui_builtin/com_trolltech_qt_gui_builtin0.h
-)
-
-#-----------------------------------------------------------------------------
-# Resources
-set(SOURCES_QRC )
-
-#-----------------------------------------------------------------------------
-# Build the library
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-add_definitions(-DPYTHONQT_EXPORTS)
-
-qt_wrap_cpp(GEN_MOC ${SOURCES_MOC})
-qt_add_resources(GEN_QRC ${SOURCES_QRC})
-
-add_library(${PythonQt} SHARED ${SOURCES} ${GEN_MOC} ${GEN_QRC} ${HEADERS})
-if(PythonQt_Qt5)
-	qt_use_modules(${PythonQt} Core Gui Widgets)
-else()
-	qt_use_modules(${PythonQt} Core Gui)
-endif()
-target_link_libraries(${PythonQt} ${PYTHON_LIBRARIES})
-
-#
-# That should solve linkage error on Mac when the project is used in a superbuild setup
-# See http://blog.onesadcookie.com/2008/01/installname-magic.html
-#
-set_target_properties(${PythonQt} PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-
-#-----------------------------------------------------------------------------
-# Install library (on windows, put the dll in 'bin' and the archive in 'lib')
-
-set_target_properties(${PythonQt} PROPERTIES PUBLIC_HEADER "${HEADERS}")
-
-install(TARGETS ${PythonQt} EXPORT ${PythonQt}Targets COMPONENT core-dev
-				RUNTIME DESTINATION bin COMPONENT core
-				LIBRARY DESTINATION lib COMPONENT core
-				ARCHIVE DESTINATION lib COMPONENT core
-				PUBLIC_HEADER DESTINATION include/PythonQt)
-
-#-----------------------------------------------------------------------------
-# Export CMake Config
-
-if(WIN32 AND NOT CYGWIN)
-	set(LIB_CMAKE_PATH "cmake")
-else()
-	set(LIB_CMAKE_PATH "lib/cmake/${PythonQt}")
-endif()
-
-export(TARGETS ${PythonQt} FILE "${PROJECT_BINARY_DIR}/${PythonQt}Targets.cmake")
-export(PACKAGE ${PythonQt})
-
-# build tree
-set(INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
-configure_file(PythonQtConfig.cmake.in "${PROJECT_BINARY_DIR}/${PythonQt}Config.cmake" @ONLY)
-# install tree
-set(INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/PythonQt")
-configure_file(PythonQtConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PythonQt}Config.cmake" @ONLY)
-# both
-configure_file(PythonQtConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/${PythonQt}ConfigVersion.cmake" @ONLY)
-
-install(EXPORT ${PythonQt}Targets DESTINATION "${LIB_CMAKE_PATH}" COMPONENT core-dev)
-install(FILES ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PythonQt}Config.cmake
-			  ${PROJECT_BINARY_DIR}/${PythonQt}ConfigVersion.cmake
-		DESTINATION "${LIB_CMAKE_PATH}" COMPONENT core-dev)
-
diff --git a/src/PythonQtConfig.cmake.in b/src/PythonQtConfig.cmake.in
deleted file mode 100644
--- a/src/PythonQtConfig.cmake.in
+++ /dev/null
@@ -1,22 +0,0 @@
-# - Config file for the PythonQt package
-# It defines the following variables
-#  PythonQt              - the PythonQt core target (PythonQt PythonQt_3 PythonQt5 PythonQt5_3)
-#  PythonQt_INCLUDE_DIRS - include directories for PythonQt
-#  PythonQt_LIBRARIES    - libraries to link against
-
-set(PythonQt @PythonQt@)
-set(PythonQt_Qt5 @PythonQt_Qt5@)
-set(PythonQt_Python3 @PythonQt_Python3@)
-set(PythonQt_Python @PYTHON_VERSION@)
-
-# Compute paths
-get_filename_component(PYTHONQT_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-set(PythonQt_INCLUDE_DIRS "@INCLUDE_DIRS@")
-
-# Our library dependencies (contains definitions for IMPORTED targets)
-if(NOT TARGET @PythonQt@)
-  include("${PYTHONQT_CMAKE_DIR}/@PythonQt@Targets.cmake")
-endif()
-
-# These are IMPORTED targets created by @PythonQt@Targets.cmake
-set(PythonQt_LIBRARIES @PythonQt@)
diff --git a/src/PythonQtConfigVersion.cmake.in b/src/PythonQtConfigVersion.cmake.in
deleted file mode 100644
--- a/src/PythonQtConfigVersion.cmake.in
+++ /dev/null
@@ -1,11 +0,0 @@
-set(PACKAGE_VERSION "@PythonQt_VERSION@")
-
-# Check whether the requested PACKAGE_FIND_VERSION is compatible
-if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
-  set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else()
-  set(PACKAGE_VERSION_COMPATIBLE TRUE)
-  if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
-	set(PACKAGE_VERSION_EXACT TRUE)
-  endif()
-endif()
diff --git a/src/src.pro b/src/src.pro
--- a/src/src.pro
+++ b/src/src.pro
@@ -30,15 +30,12 @@ mac {
   OTHER_FILES += ../scripts/osx-fix-dylib.sh
 }
 
-include ( ../build/common.prf )  
-include ( ../build/python.prf )
+CONFIG += BUILDING_PYTHONQT
+include ( ../build/pythonqt.prf )
 
 include ( src.pri )  
 
-#added by Aje for install QT dirs.
-#Copyed from Qscintilla config ;).
-
-
+#Install PythonQt as Qt feature
 pythoncfg.path = $$[QT_INSTALL_PREFIX]/mkspecs/features
 pythoncfg.files = ../build/pythonqt.prf
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
deleted file mode 100644
--- a/tests/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# PythonQt Tests
-# must be included from PythonQt main CMakeLists
-
-project(PythonQt_Tests)
-
-SET(HEADERS
-	PythonQtTests.h
-)
-
-SET(SOURCES
-	PythonQtTestMain.cpp
-	PythonQtTests.cpp
-)
-
-include_directories(../src)
-
-qt_wrap_cpp(GEN_HEADERS ${HEADERS})
-
-add_executable(PythonQtTest ${SOURCES} ${GEN_HEADERS})
-if(PythonQt_Qt5)
-	qt_use_modules(PythonQtTest Test Gui Widgets)
-else()
-	qt_use_modules(PythonQtTest Test Gui)
-endif()
-get_property(PythonQt_lib TARGET ${PythonQt} PROPERTY LOCATION)
-target_link_libraries(PythonQtTest ${PythonQt_lib} ${PYTHON_LIBRARIES})