Title: [96360] trunk/Tools
- Revision
- 96360
- Author
- [email protected]
- Date
- 2011-09-29 14:29:11 -0700 (Thu, 29 Sep 2011)
Log Message
[Qt] Try to fix the minial build
* QtTestBrowser/launcherwindow.cpp:
* QtTestBrowser/webpage.cpp:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (96359 => 96360)
--- trunk/Tools/ChangeLog 2011-09-29 21:15:56 UTC (rev 96359)
+++ trunk/Tools/ChangeLog 2011-09-29 21:29:11 UTC (rev 96360)
@@ -1,3 +1,10 @@
+2011-09-29 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Try to fix the minial build
+
+ * QtTestBrowser/launcherwindow.cpp:
+ * QtTestBrowser/webpage.cpp:
+
2011-09-23 Tor Arne Vestbø <[email protected]>
[Qt] Fix build against Qt5 after refactor of widgets out of QtGUi
Modified: trunk/Tools/QtTestBrowser/launcherwindow.cpp (96359 => 96360)
--- trunk/Tools/QtTestBrowser/launcherwindow.cpp 2011-09-29 21:15:56 UTC (rev 96359)
+++ trunk/Tools/QtTestBrowser/launcherwindow.cpp 2011-09-29 21:29:11 UTC (rev 96360)
@@ -800,7 +800,9 @@
void LauncherWindow::setEditable(bool on)
{
page()->setContentEditable(on);
+#ifndef QT_NO_SHORTCUT
m_formatMenuAction->setVisible(on);
+#endif
}
/*
@@ -861,7 +863,9 @@
{
m_windowOptions.useGraphicsView = graphicsBased;
initializeView();
+#ifndef QT_NO_SHORTCUT
menuBar()->clear();
+#endif
createChrome();
}
Modified: trunk/Tools/QtTestBrowser/webpage.cpp (96359 => 96360)
--- trunk/Tools/QtTestBrowser/webpage.cpp 2011-09-29 21:15:56 UTC (rev 96359)
+++ trunk/Tools/QtTestBrowser/webpage.cpp 2011-09-29 21:29:11 UTC (rev 96360)
@@ -40,6 +40,7 @@
#ifndef QT_NO_DESKTOPSERVICES
#include <QDesktopServices>
#endif
+#include <QDialog>
#include <QDialogButtonBox>
#include <QLabel>
#include <QLayout>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
