Add MSVC 2017, Qt 5.8, and Qt 5.9 support

Author: kislinsk

CMakeLists.txt

@@ -5,7 +5,7 @@
 # If you are not a CMake expert, you should better use the provided qmake profiles.
 #-----------------------------------------------------------------------------
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.0)
 
 #-----------------------------------------------------------------------------
 project(PythonQt)
@@ -150,6 +150,8 @@ if(PythonQt_QT_VERSION VERSION_GREATER "4")
     list(APPEND QT_LIBRARIES ${Qt5${qtlib}_LIBRARIES})
   endforeach()
 
+  include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS})
+
   set(QT_VERSION_MAJOR ${Qt5Core_VERSION_MAJOR})
   set(QT_VERSION_MINOR ${Qt5Core_VERSION_MINOR})
 
@@ -234,6 +236,8 @@ set(sources
     src/PythonQtStdDecorators.cpp
     src/PythonQtStdIn.cpp
     src/PythonQtStdOut.cpp
+    src/PythonQtProperty.cpp
+    src/PythonQtSlotDecorator.cpp
     src/gui/PythonQtScriptingConsole.cpp
 
     generated_cpp${generated_cpp_suffix}/PythonQt_QtBindings.cpp
@@ -272,6 +276,8 @@ set(headers
     src/PythonQtUtils.h
     src/PythonQtVariants.h
     src/PythonQtPythonInclude.h
+    src/PythonQtProperty.h
+    src/PythonQtSlotDecorator.cpp
     generated_cpp${generated_cpp_suffix}/PythonQt_QtBindings.h
 )
 
@@ -342,6 +348,10 @@ set_target_properties(PythonQt  PROPERTIES
   INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
   )
 
+target_compile_options(PythonQt PRIVATE
+  $<$<AND:$<CXX_COMPILER_ID:MSVC>,$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,19.0>>:/bigobj>
+  )
+
 target_link_libraries(PythonQt
               ${PYTHON_LIBRARY}
               ${QT_LIBRARIES}

README.md

@@ -17,13 +17,13 @@ official repository.
 Prerequisites
 -------------
 
-* CMake 2.8.x
+* CMake 3.x
 * Qt 4.6.2 or above
 
 Build instructions
 ------------------
 
-By default, the `patched-5` version will be checked out.
+By default, the `patched-7` version will be checked out.
 
 ```
 git clone git://github.com/commontk/PythonQt.git
@@ -43,7 +43,13 @@ Additional configure options are:
 Available branches
 ------------------
 
-This repository contains 8 branches:
+This repository contains 9 branches:
+
+### patched-9
+* Based on patched-8
+* List of features:
+  * Add MSVC 2017 support
+  * Add Qt 5.8 and Qt 5.9 support
 
 ### patched-8
 * Based on [r455](http://sourceforge.net/p/pythonqt/code/455/) with:

generated_cpp_54/com_trolltech_qt_core_builtin/com_trolltech_qt_core_builtin0.h

@@ -1264,7 +1264,11 @@ enum WindowModality{
 enum WindowState{
   WindowNoState = Qt::WindowNoState,   WindowMinimized = Qt::WindowMinimized,   WindowMaximized = Qt::WindowMaximized,   WindowFullScreen = Qt::WindowFullScreen,   WindowActive = Qt::WindowActive};
 enum WindowType{
-  Widget = Qt::Widget,   Window = Qt::Window,   Dialog = Qt::Dialog,   Sheet = Qt::Sheet,   Drawer = Qt::Drawer,   Popup = Qt::Popup,   Tool = Qt::Tool,   ToolTip = Qt::ToolTip,   SplashScreen = Qt::SplashScreen,   Desktop = Qt::Desktop,   SubWindow = Qt::SubWindow,   ForeignWindow = Qt::ForeignWindow,   CoverWindow = Qt::CoverWindow,   WindowType_Mask = Qt::WindowType_Mask,   MSWindowsFixedSizeDialogHint = Qt::MSWindowsFixedSizeDialogHint,   MSWindowsOwnDC = Qt::MSWindowsOwnDC,   BypassWindowManagerHint = Qt::BypassWindowManagerHint,   X11BypassWindowManagerHint = Qt::X11BypassWindowManagerHint,   FramelessWindowHint = Qt::FramelessWindowHint,   WindowTitleHint = Qt::WindowTitleHint,   WindowSystemMenuHint = Qt::WindowSystemMenuHint,   WindowMinimizeButtonHint = Qt::WindowMinimizeButtonHint,   WindowMaximizeButtonHint = Qt::WindowMaximizeButtonHint,   WindowMinMaxButtonsHint = Qt::WindowMinMaxButtonsHint,   WindowContextHelpButtonHint = Qt::WindowContextHelpButtonHint,   WindowShadeButtonHint = Qt::WindowShadeButtonHint,   WindowStaysOnTopHint = Qt::WindowStaysOnTopHint,   WindowTransparentForInput = Qt::WindowTransparentForInput,   WindowOverridesSystemGestures = Qt::WindowOverridesSystemGestures,   WindowDoesNotAcceptFocus = Qt::WindowDoesNotAcceptFocus,   CustomizeWindowHint = Qt::CustomizeWindowHint,   WindowStaysOnBottomHint = Qt::WindowStaysOnBottomHint,   WindowCloseButtonHint = Qt::WindowCloseButtonHint,   MacWindowToolBarButtonHint = Qt::MacWindowToolBarButtonHint,   BypassGraphicsProxyWidget = Qt::BypassGraphicsProxyWidget,   WindowOkButtonHint = Qt::WindowOkButtonHint,   WindowCancelButtonHint = Qt::WindowCancelButtonHint,   NoDropShadowWindowHint = Qt::NoDropShadowWindowHint,   WindowFullscreenButtonHint = Qt::WindowFullscreenButtonHint};
+  Widget = Qt::Widget,   Window = Qt::Window,   Dialog = Qt::Dialog,   Sheet = Qt::Sheet,   Drawer = Qt::Drawer,   Popup = Qt::Popup,   Tool = Qt::Tool,   ToolTip = Qt::ToolTip,   SplashScreen = Qt::SplashScreen,   Desktop = Qt::Desktop,   SubWindow = Qt::SubWindow,   ForeignWindow = Qt::ForeignWindow,   CoverWindow = Qt::CoverWindow,   WindowType_Mask = Qt::WindowType_Mask,   MSWindowsFixedSizeDialogHint = Qt::MSWindowsFixedSizeDialogHint,   MSWindowsOwnDC = Qt::MSWindowsOwnDC,   BypassWindowManagerHint = Qt::BypassWindowManagerHint,   X11BypassWindowManagerHint = Qt::X11BypassWindowManagerHint,   FramelessWindowHint = Qt::FramelessWindowHint,   WindowTitleHint = Qt::WindowTitleHint,   WindowSystemMenuHint = Qt::WindowSystemMenuHint,   WindowMinimizeButtonHint = Qt::WindowMinimizeButtonHint,   WindowMaximizeButtonHint = Qt::WindowMaximizeButtonHint,   WindowMinMaxButtonsHint = Qt::WindowMinMaxButtonsHint,   WindowContextHelpButtonHint = Qt::WindowContextHelpButtonHint,   WindowShadeButtonHint = Qt::WindowShadeButtonHint,   WindowStaysOnTopHint = Qt::WindowStaysOnTopHint,   WindowTransparentForInput = Qt::WindowTransparentForInput,   WindowOverridesSystemGestures = Qt::WindowOverridesSystemGestures,   WindowDoesNotAcceptFocus = Qt::WindowDoesNotAcceptFocus,   CustomizeWindowHint = Qt::CustomizeWindowHint,   WindowStaysOnBottomHint = Qt::WindowStaysOnBottomHint,   WindowCloseButtonHint = Qt::WindowCloseButtonHint,   MacWindowToolBarButtonHint = Qt::MacWindowToolBarButtonHint,   BypassGraphicsProxyWidget = Qt::BypassGraphicsProxyWidget,   NoDropShadowWindowHint = Qt::NoDropShadowWindowHint,   WindowFullscreenButtonHint = Qt::WindowFullscreenButtonHint
+#if QT_VERSION < 0x50800
+  , WindowOkButtonHint = Qt::WindowOkButtonHint, WindowCancelButtonHint = Qt::WindowCancelButtonHint
+#endif
+};
 Q_DECLARE_FLAGS(Alignment, AlignmentFlag)
 Q_DECLARE_FLAGS(DockWidgetAreas, DockWidgetArea)
 Q_DECLARE_FLAGS(DropActions, DropAction)