Modified: trunk/Tools/ChangeLog (98460 => 98461)
--- trunk/Tools/ChangeLog 2011-10-26 09:49:21 UTC (rev 98460)
+++ trunk/Tools/ChangeLog 2011-10-26 09:59:17 UTC (rev 98461)
@@ -1,3 +1,18 @@
+2011-10-26 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [Qt][WK2] Fix failing assertion on startup of MiniBrowser -touch.
+
+ Reviewed by Tor Arne Vestbø.
+
+ We're using QScroller since r98460, which requires QWidget/QApplication. So
+ use QApplication and QtWidgets for the time being.
+
+ * MiniBrowser/qt/MiniBrowser.pro:
+ * MiniBrowser/qt/MiniBrowserApplication.cpp:
+ (MiniBrowserApplication::MiniBrowserApplication):
+ (MiniBrowserApplication::notify):
+ * MiniBrowser/qt/MiniBrowserApplication.h:
+
2011-10-25 Zeno Albisser <zeno.albis...@nokia.com>
[Qt][WK2] Rewrite MiniBrowser in QML
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowser.pro (98460 => 98461)
--- trunk/Tools/MiniBrowser/qt/MiniBrowser.pro 2011-10-26 09:49:21 UTC (rev 98460)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowser.pro 2011-10-26 09:59:17 UTC (rev 98461)
@@ -28,7 +28,7 @@
DESTDIR = $$OUTPUT_DIR/bin
CONFIG -= app_bundle
-QT += network declarative
+QT += network declarative widgets
macx:QT+=xml
linux-* {
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (98460 => 98461)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2011-10-26 09:49:21 UTC (rev 98460)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2011-10-26 09:59:17 UTC (rev 98461)
@@ -36,7 +36,7 @@
#include <QEvent>
#include <QMouseEvent>
#include <QTouchEvent>
-#include <QGuiApplication>
+#include <QApplication>
static inline bool isTouchEvent(const QEvent* event)
{
@@ -64,7 +64,7 @@
}
MiniBrowserApplication::MiniBrowserApplication(int& argc, char** argv)
- : QGuiApplication(argc, argv)
+ : QApplication(argc, argv)
, m_windowOptions(this)
, m_realTouchEventReceived(false)
, m_pendingFakeTouchEventCount(0)
@@ -85,14 +85,14 @@
// with touch screen, and we should not have touch mocking.
if (!event->spontaneous() || m_realTouchEventReceived)
- return QGuiApplication::notify(target, event);
+ return QApplication::notify(target, event);
if (isTouchEvent(event) && static_cast<QTouchEvent*>(event)->deviceType() == QTouchEvent::TouchScreen) {
if (m_pendingFakeTouchEventCount)
--m_pendingFakeTouchEventCount;
else
m_realTouchEventReceived = true;
- return QGuiApplication::notify(target, event);
+ return QApplication::notify(target, event);
}
QWindow* targetWindow = qobject_cast<QWindow*>(target);
@@ -114,13 +114,13 @@
break;
case QEvent::MouseMove:
if (!mouseEvent->buttons() || !m_touchPoints.contains(mouseEvent->buttons()))
- return QGuiApplication::notify(target, event);
+ return QApplication::notify(target, event);
touchPoint.state = Qt::TouchPointMoved;
touchPoint.id = mouseEvent->buttons();
break;
case QEvent::MouseButtonRelease:
if (mouseEvent->modifiers().testFlag(Qt::ControlModifier))
- return QGuiApplication::notify(target, event);
+ return QApplication::notify(target, event);
touchPoint.state = Qt::TouchPointReleased;
touchPoint.id = mouseEvent->button();
break;
@@ -151,7 +151,7 @@
break;
case Qt::TouchPointStationary:
// Don't send the event if nothing changed.
- return QGuiApplication::notify(target, event);
+ return QApplication::notify(target, event);
default:
eventType = QEvent::TouchUpdate;
break;
@@ -167,7 +167,7 @@
}
}
- return QGuiApplication::notify(target, event);
+ return QApplication::notify(target, event);
}
void MiniBrowserApplication::handleUserOptions()
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h (98460 => 98461)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2011-10-26 09:49:21 UTC (rev 98460)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2011-10-26 09:59:17 UTC (rev 98461)
@@ -33,7 +33,7 @@
#include <QObject>
#include <QStringList>
#include <QtDeclarative>
-#include <QtGui/QGuiApplication>
+#include <QtWidgets/QApplication>
#include <QTouchEvent>
#include <QUrl>
#include "qwindowsysteminterface_qpa.h"
@@ -66,7 +66,7 @@
bool m_startMaximized;
};
-class MiniBrowserApplication : public QGuiApplication {
+class MiniBrowserApplication : public QApplication {
Q_OBJECT
public:
