[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/4.3/kdeedu/marble
From: Torsten Rahn <tackat () kde ! org>
Date: 2009-10-16 18:10:28
Message-ID: 1255716628.728293.26107.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1036159 by rahn:
- 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
--- branches/KDE/4.3/kdeedu/marble/CMakeLists.txt #1036158:1036159
@@ -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
--- branches/KDE/4.3/kdeedu/marble/src/QtMainWindow.cpp #1036158:1036159
@@ -330,6 +330,7 @@
void MainWindow::printMapScreenShot()
{
+#ifndef QT_NO_PRINTER
QPixmap mapPixmap = m_controlView->mapScreenShot();
QSize printSize = mapPixmap.size();
@@ -354,6 +355,7 @@
painter.drawPixmap( mapPrintRect, mapPixmap, mapPixmap.rect() );
}
+#endif
}
void MainWindow::showFullScreen( bool isChecked )
--- branches/KDE/4.3/kdeedu/marble/src/lib/TinyWebBrowser.cpp #1036158:1036159
@@ -80,11 +80,13 @@
void TinyWebBrowser::print()
{
+#ifndef QT_NO_PRINTER
QPrinter printer;
QPrintDialog dlg( &printer, this );
if ( dlg.exec() )
QWebView::print( &printer );
+#endif
}
void TinyWebBrowser::openExternalLink( QUrl url )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic