Title: [88167] trunk/Tools
- Revision
- 88167
- Author
- [email protected]
- Date
- 2011-06-06 07:52:19 -0700 (Mon, 06 Jun 2011)
Log Message
[Qt] Implement download feature for QtTestBrowser
https://bugs.webkit.org/show_bug.cgi?id=61865
Buildfix for --minimal and CONFIG+=qt_minimal build after r88161.
* QtTestBrowser/launcherwindow.cpp:
(LauncherWindow::LauncherWindow):
* QtTestBrowser/launcherwindow.h:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (88166 => 88167)
--- trunk/Tools/ChangeLog 2011-06-06 14:15:30 UTC (rev 88166)
+++ trunk/Tools/ChangeLog 2011-06-06 14:52:19 UTC (rev 88167)
@@ -1,3 +1,14 @@
+2011-06-06 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Implement download feature for QtTestBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=61865
+
+ Buildfix for --minimal and CONFIG+=qt_minimal build after r88161.
+
+ * QtTestBrowser/launcherwindow.cpp:
+ (LauncherWindow::LauncherWindow):
+ * QtTestBrowser/launcherwindow.h:
+
2011-06-06 Barát Tibor <[email protected]>
Reviewed by Csaba Osztrogonác.
Modified: trunk/Tools/QtTestBrowser/launcherwindow.cpp (88166 => 88167)
--- trunk/Tools/QtTestBrowser/launcherwindow.cpp 2011-06-06 14:15:30 UTC (rev 88166)
+++ trunk/Tools/QtTestBrowser/launcherwindow.cpp 2011-06-06 14:52:19 UTC (rev 88167)
@@ -34,10 +34,13 @@
#include "launcherwindow.h"
#include "urlloader.h"
+
+#if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX)
#include <QFileDialog>
#include <QFileInfo>
#include <QMessageBox>
#include <QNetworkReply>
+#endif
const int gExitClickArea = 80;
QVector<int> LauncherWindow::m_zoomLevels;
@@ -50,7 +53,9 @@
, m_inspector(0)
, m_formatMenuAction(0)
, m_zoomAnimation(0)
+#if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX)
, m_reply(0)
+#endif
#ifndef QT_NO_LINEEDIT
, m_findFlag(0)
#endif
@@ -63,8 +68,9 @@
static_cast<QGraphicsView*>(m_view)->setScene(sharedScene);
createChrome();
-
+#if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX)
connect(page(), SIGNAL(downloadRequested(const QNetworkRequest&)), this, SLOT(downloadRequest(const QNetworkRequest&)));
+#endif
}
LauncherWindow::~LauncherWindow()
@@ -975,6 +981,7 @@
output << "Loaded: " << url.toString() << endl;
}
+#if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX)
void LauncherWindow::downloadRequest(const QNetworkRequest &request)
{
QNetworkAccessManager* manager = new QNetworkAccessManager(this);
@@ -1000,6 +1007,7 @@
QMessageBox::information(this, QString("Download"), fileName + QString(" downloaded successfully."));
}
}
+#endif
void LauncherWindow::updateFPS(int fps)
{
Modified: trunk/Tools/QtTestBrowser/launcherwindow.h (88166 => 88167)
--- trunk/Tools/QtTestBrowser/launcherwindow.h 2011-06-06 14:15:30 UTC (rev 88166)
+++ trunk/Tools/QtTestBrowser/launcherwindow.h 2011-06-06 14:52:19 UTC (rev 88167)
@@ -206,8 +206,10 @@
void showUserAgentDialog();
void printURL(const QUrl&);
+#if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX)
void downloadRequest(const QNetworkRequest&);
void fileDownloadFinished();
+#endif
public slots:
LauncherWindow* newWindow();
@@ -240,7 +242,9 @@
QAction* m_formatMenuAction;
QPropertyAnimation* m_zoomAnimation;
+#if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX)
QNetworkReply* m_reply;
+#endif
QList<QTouchEvent::TouchPoint> m_touchPoints;
bool m_touchMocking;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
