diff options
Diffstat (limited to 'examples/embedded/lightmaps')
-rw-r--r-- | examples/embedded/lightmaps/lightmaps.cpp | 5 | ||||
-rw-r--r-- | examples/embedded/lightmaps/lightmaps.pro | 7 | ||||
-rw-r--r-- | examples/embedded/lightmaps/main.cpp | 7 | ||||
-rw-r--r-- | examples/embedded/lightmaps/mapzoom.cpp | 8 |
4 files changed, 0 insertions, 27 deletions
diff --git a/examples/embedded/lightmaps/lightmaps.cpp b/examples/embedded/lightmaps/lightmaps.cpp index 2489ddc840..2b97abacd8 100644 --- a/examples/embedded/lightmaps/lightmaps.cpp +++ b/examples/embedded/lightmaps/lightmaps.cpp @@ -122,11 +122,6 @@ void LightMaps::paintEvent(QPaintEvent *event) p.begin(this); m_normalMap->render(&p, event->rect()); p.setPen(Qt::black); -#if defined(Q_OS_SYMBIAN) - QFont font = p.font(); - font.setPixelSize(13); - p.setFont(font); -#endif p.drawText(rect(), Qt::AlignBottom | Qt::TextWordWrap, "Map data CCBYSA 2009 OpenStreetMap.org contributors"); p.end(); diff --git a/examples/embedded/lightmaps/lightmaps.pro b/examples/embedded/lightmaps/lightmaps.pro index 1f638b5398..92ef6b9410 100644 --- a/examples/embedded/lightmaps/lightmaps.pro +++ b/examples/embedded/lightmaps/lightmaps.pro @@ -8,13 +8,6 @@ SOURCES = lightmaps.cpp \ slippymap.cpp QT += network widgets -symbian { - TARGET.UID3 = 0xA000CF75 - CONFIG += qt_example - TARGET.CAPABILITY = NetworkServices - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 -} - target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/lightmaps sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/lightmaps diff --git a/examples/embedded/lightmaps/main.cpp b/examples/embedded/lightmaps/main.cpp index 85f74e638e..999c355f25 100644 --- a/examples/embedded/lightmaps/main.cpp +++ b/examples/embedded/lightmaps/main.cpp @@ -44,20 +44,13 @@ int main(int argc, char **argv) { -#if defined(Q_WS_X11) - QApplication::setGraphicsSystem("raster"); -#endif QApplication app(argc, argv); app.setApplicationName("LightMaps"); MapZoom w; -#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM) - w.showMaximized(); -#else w.resize(600, 450); w.show(); -#endif return app.exec(); } diff --git a/examples/embedded/lightmaps/mapzoom.cpp b/examples/embedded/lightmaps/mapzoom.cpp index 225c54c2a6..c1b43f07c7 100644 --- a/examples/embedded/lightmaps/mapzoom.cpp +++ b/examples/embedded/lightmaps/mapzoom.cpp @@ -64,13 +64,6 @@ MapZoom::MapZoom() connect(nightModeAction, SIGNAL(triggered()), map, SLOT(toggleNightMode())); connect(osmAction, SIGNAL(triggered()), SLOT(aboutOsm())); -#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM) - menuBar()->addAction(osloAction); - menuBar()->addAction(berlinAction); - menuBar()->addAction(jakartaAction); - menuBar()->addAction(nightModeAction); - menuBar()->addAction(osmAction); -#else QMenu *menu = menuBar()->addMenu(tr("&Options")); menu->addAction(osloAction); menu->addAction(berlinAction); @@ -78,7 +71,6 @@ MapZoom::MapZoom() menu->addSeparator(); menu->addAction(nightModeAction); menu->addAction(osmAction); -#endif QNetworkConfigurationManager manager; if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) { |