Changeset 88167 in webkit

Timestamp:

Jun 6, 2011 7:52:19 AM (13 years ago)

Author:

Csaba Osztrogonác

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:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• QtTestBrowser/launcherwindow.cpp (modified) (5 diffs)
• QtTestBrowser/launcherwindow.h (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-06  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [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  <Barat.Tibor@stud.u-szeged.hu>
 

trunk/Tools/QtTestBrowser/launcherwindow.cpp

@@ -35 +35 @@
 #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;
@@ -51 +54 @@
     , 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)
@@ -64 +69 @@
 
     createChrome();
-
+#if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX)
     connect(page(), SIGNAL(downloadRequested(const QNetworkRequest&)), this, SLOT(downloadRequest(const QNetworkRequest&)));
+#endif
 }
 
@@ -976 +982 @@
 }
 
+#if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX)
 void LauncherWindow::downloadRequest(const QNetworkRequest &request)
 {
@@ -1001 +1008 @@
     }
 }
+#endif
 
 void LauncherWindow::updateFPS(int fps)

trunk/Tools/QtTestBrowser/launcherwindow.h

@@ -207 +207 @@
 
     void printURL(const QUrl&);
+#if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX)
     void downloadRequest(const QNetworkRequest&);
     void fileDownloadFinished();
+#endif
 
 public slots:
@@ -241 +243 @@
 
     QPropertyAnimation* m_zoomAnimation;
+#if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX)
     QNetworkReply* m_reply;
+#endif
     QList<QTouchEvent::TouchPoint> m_touchPoints;
     bool m_touchMocking;