[Plplot-cvs] SF.net SVN: plplot:[13057] trunk

[<and...@us...>]

Revision: 13057
          http://sourceforge.net/p/plplot/code/13057
Author:   andrewross
Date:     2014-03-14 23:17:42 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
Some more minor fixes to get plplot compiling with Qt5. These were required for Linux with Qt 5.2.0.

Modified Paths:
--------------
    trunk/bindings/qt_gui/CMakeLists.txt
    trunk/bindings/qt_gui/plqt.cpp
    trunk/drivers/CMakeLists.txt
    trunk/src/CMakeLists.txt

Modified: trunk/bindings/qt_gui/CMakeLists.txt
===================================================================
--- trunk/bindings/qt_gui/CMakeLists.txt	2014-03-14 17:24:49 UTC (rev 13056)
+++ trunk/bindings/qt_gui/CMakeLists.txt	2014-03-14 23:17:42 UTC (rev 13057)
@@ -45,7 +45,7 @@
     # According to advice from Steve Kelly on the Cmake list, the Qt5
     # Gui component is a dependency of the Qt5 Svg component so is not
     # needed here, but I will leave it in since it is informative.
-    qt5_use_modules(plplotqt${LIB_TAG} Svg Gui)
+    qt5_use_modules(plplotqt${LIB_TAG} Svg Gui PrintSupport)
 
     target_link_libraries(
       plplotqt${LIB_TAG}

Modified: trunk/bindings/qt_gui/plqt.cpp
===================================================================
--- trunk/bindings/qt_gui/plqt.cpp	2014-03-14 17:24:49 UTC (rev 13056)
+++ trunk/bindings/qt_gui/plqt.cpp	2014-03-14 23:17:42 UTC (rev 13057)
@@ -614,7 +614,9 @@
     setOutputFileName( QString( fileName ) );
     if ( ifeps )
     {
+#ifndef PLPLOT_USE_QT5
         setOutputFormat( QPrinter::PostScriptFormat );
+#endif
     }
     else
     {

Modified: trunk/drivers/CMakeLists.txt
===================================================================
--- trunk/drivers/CMakeLists.txt	2014-03-14 17:24:49 UTC (rev 13056)
+++ trunk/drivers/CMakeLists.txt	2014-03-14 23:17:42 UTC (rev 13057)
@@ -110,7 +110,7 @@
 	  # According to advice from Steve Kelly on the Cmake list, the Qt5
 	  # Gui component is a dependency of the Qt5 Svg component so is not
 	  # needed here, but I will leave it in since it is informative.
-	  qt5_use_modules(${SOURCE_ROOT_NAME} Svg Gui)
+	  qt5_use_modules(${SOURCE_ROOT_NAME} Svg Gui PrintSupport)
 	  target_link_libraries(
 	    ${SOURCE_ROOT_NAME}
 	    plplot${LIB_TAG}

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2014-03-14 17:24:49 UTC (rev 13056)
+++ trunk/src/CMakeLists.txt	2014-03-14 23:17:42 UTC (rev 13057)
@@ -188,7 +188,7 @@
   # According to advice from Steve Kelly on the Cmake list, the Qt5
   # Gui component is a dependency of the Qt5 Svg component so is not
   # needed here, but I will leave it in since it is informative.
-  qt5_use_modules(plplot${LIB_TAG} Svg Gui)
+  qt5_use_modules(plplot${LIB_TAG} Svg Gui PrintSupport)
 endif(NOT ENABLE_DYNDRIVERS AND ANY_QT_DEVICE AND PLPLOT_USE_QT5)
 
 if(NON_TRANSITIVE)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.