Title: [104556] trunk/Tools
- Revision
- 104556
- Author
- [email protected]
- Date
- 2012-01-10 05:24:58 -0800 (Tue, 10 Jan 2012)
Log Message
[Qt] Don't expose m_windowOptions as part of the public interface in MiniBrowserApplication
https://bugs.webkit.org/show_bug.cgi?id=75894
Patch by Alexander Færøy <[email protected]> on 2012-01-10
Reviewed by Tor Arne Vestbø.
* MiniBrowser/qt/MiniBrowserApplication.h:
(MiniBrowserApplication::windowOptions):
* MiniBrowser/qt/main.cpp:
(main):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (104555 => 104556)
--- trunk/Tools/ChangeLog 2012-01-10 13:06:32 UTC (rev 104555)
+++ trunk/Tools/ChangeLog 2012-01-10 13:24:58 UTC (rev 104556)
@@ -1,3 +1,15 @@
+2012-01-10 Alexander Færøy <[email protected]>
+
+ [Qt] Don't expose m_windowOptions as part of the public interface in MiniBrowserApplication
+ https://bugs.webkit.org/show_bug.cgi?id=75894
+
+ Reviewed by Tor Arne Vestbø.
+
+ * MiniBrowser/qt/MiniBrowserApplication.h:
+ (MiniBrowserApplication::windowOptions):
+ * MiniBrowser/qt/main.cpp:
+ (main):
+
2012-01-10 Simon Hausmann <[email protected]>
[Qt] DRT crashes with Qt 5
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h (104555 => 104556)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2012-01-10 13:06:32 UTC (rev 104555)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2012-01-10 13:24:58 UTC (rev 104556)
@@ -98,9 +98,8 @@
bool isRobotized() const { return m_isRobotized; }
int robotTimeout() const { return m_robotTimeoutSeconds; }
int robotExtraTime() const { return m_robotExtraTimeSeconds; }
+ WindowOptions* windowOptions() { return &m_windowOptions; }
- WindowOptions m_windowOptions;
-
virtual bool notify(QObject*, QEvent*);
private:
@@ -117,6 +116,8 @@
QHash<int, QWindowSystemInterface::TouchPoint> m_touchPoints;
QSet<int> m_heldTouchPoints;
+
+ WindowOptions m_windowOptions;
};
QML_DECLARE_TYPE(WindowOptions);
Modified: trunk/Tools/MiniBrowser/qt/main.cpp (104555 => 104556)
--- trunk/Tools/MiniBrowser/qt/main.cpp 2012-01-10 13:06:32 UTC (rev 104555)
+++ trunk/Tools/MiniBrowser/qt/main.cpp 2012-01-10 13:24:58 UTC (rev 104556)
@@ -45,7 +45,7 @@
MiniBrowserApplication app(argc, argv);
if (app.isRobotized()) {
- BrowserWindow* window = new BrowserWindow(&app.m_windowOptions);
+ BrowserWindow* window = new BrowserWindow(app.windowOptions());
UrlLoader loader(window, app.urls().at(0), app.robotTimeout(), app.robotExtraTime());
loader.loadNext();
window->show();
@@ -62,7 +62,7 @@
urls.append("http://www.google.com");
}
- BrowserWindow* window = new BrowserWindow(&app.m_windowOptions);
+ BrowserWindow* window = new BrowserWindow(app.windowOptions());
window->load(urls.at(0));
for (int i = 1; i < urls.size(); ++i)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
