summaryrefslogtreecommitdiffstats
path: root/tools/qml/qmlruntime.cpp
diff options
context:
space:
mode:
authorJoona Petrell <joona.t.petrell@nokia.com>2010-12-31 05:49:48 (GMT)
committerJoona Petrell <joona.t.petrell@nokia.com>2010-12-31 05:53:07 (GMT)
commit59ec08d255b7d7bd8975bdbfd0b0a42c1b6ed2a0 (patch)
tree133670e39189e1f1256bc219385f370fb9950072 /tools/qml/qmlruntime.cpp
parente8b736c44426fd4ae832e82a9e624c9737a40213 (diff)
downloadQt-59ec08d255b7d7bd8975bdbfd0b0a42c1b6ed2a0.zip
Qt-59ec08d255b7d7bd8975bdbfd0b0a42c1b6ed2a0.tar.gz
Qt-59ec08d255b7d7bd8975bdbfd0b0a42c1b6ed2a0.tar.bz2
Provide qmlviewer warning window also on Symbian
Task-number: QTBUG-10800 Reviewed-by: Christopher Ham
Diffstat (limited to 'tools/qml/qmlruntime.cpp')
-rw-r--r--tools/qml/qmlruntime.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index 142e4c5..b829528 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -742,8 +742,10 @@ void QDeclarativeViewer::createMenu()
connect(slowAction, SIGNAL(triggered(bool)), this, SLOT(setSlowMode(bool)));
showWarningsWindow = new QAction(tr("Show Warnings"), this);
+#if !defined(Q_OS_SYMBIAN)
showWarningsWindow->setCheckable((true));
showWarningsWindow->setChecked(loggerWindow->isVisible());
+#endif
connect(showWarningsWindow, SIGNAL(triggered(bool)), this, SLOT(showWarnings(bool)));
QAction *proxyAction = new QAction(tr("HTTP &Proxy..."), this);
@@ -826,11 +828,11 @@ void QDeclarativeViewer::createMenu()
QMenu *recordMenu = menu->addMenu(tr("&Recording"));
recordMenu->addAction(snapshotAction);
recordMenu->addAction(recordAction);
+#endif // ! Q_OS_SYMBIAN
QMenu *debugMenu = menu->addMenu(tr("&Debugging"));
debugMenu->addAction(slowAction);
debugMenu->addAction(showWarningsWindow);
-#endif // ! Q_OS_SYMBIAN
QMenu *settingsMenu = menu->addMenu(tr("&Settings"));
settingsMenu->addAction(proxyAction);
@@ -914,7 +916,11 @@ void QDeclarativeViewer::toggleFullScreen()
void QDeclarativeViewer::showWarnings(bool show)
{
+#if defined(Q_OS_SYMBIAN)
+ loggerWindow->showMaximized();
+#else
loggerWindow->setVisible(show);
+#endif
}
void QDeclarativeViewer::warningsWidgetOpened()