[Marble-commits] KDE/kdeedu/marble

[Torsten Rahn]

SVN commit 1038668 by rahn:

- Forward port of 1036159
- Support systems with a Qt version that doesn't have printer support
  compiled in.



 M  +1 -0      CMakeLists.txt  
 M  +2 -0      src/QtMainWindow.cpp  
 M  +2 -0      src/lib/TinyWebBrowser.cpp  


--- trunk/KDE/kdeedu/marble/CMakeLists.txt #1038667:1038668
@@ -3,6 +3,7 @@
 ####################################################
 # CMake Settings 
 SET(CMAKE_COLOR_MAKEFILE ON)
+# SET(CMAKE_SKIP_RPATH ON)
 
 ####################################################
 # Generate the tiles with the tilecreator at compile time
--- trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp #1038667:1038668
@@ -383,6 +383,7 @@
 
 void MainWindow::printMapScreenShot()
 {
+#ifndef QT_NO_PRINTER
     QPixmap mapPixmap = m_controlView->mapScreenShot();
 
     QSize printSize = mapPixmap.size();
@@ -407,6 +408,7 @@
         painter.drawPixmap( mapPrintRect, mapPixmap, mapPixmap.rect() );
 
     }
+#endif    
 }
 
 void MainWindow::showFullScreen( bool isChecked )
--- trunk/KDE/kdeedu/marble/src/lib/TinyWebBrowser.cpp #1038667:1038668
@@ -80,11 +80,13 @@
 
 void TinyWebBrowser::print()
 {
+#ifndef QT_NO_PRINTER	
   QPrinter printer;
 
   QPrintDialog dlg( &printer, this );
   if ( dlg.exec() )
     QWebView::print( &printer );
+#endif
 }
 
 QWebView *TinyWebBrowser::createWindow( QWebPage::WebWindowType type )