summaryrefslogtreecommitdiffstats
path: root/Tools/MiniBrowser/qt
diff options
context:
space:
mode:
Diffstat (limited to 'Tools/MiniBrowser/qt')
-rw-r--r--Tools/MiniBrowser/qt/BrowserWindow.cpp9
-rw-r--r--Tools/MiniBrowser/qt/BrowserWindow.h2
-rw-r--r--Tools/MiniBrowser/qt/MiniBrowser.pro2
-rw-r--r--Tools/MiniBrowser/qt/MiniBrowserApplication.cpp4
-rw-r--r--Tools/MiniBrowser/qt/MiniBrowserApplication.h2
5 files changed, 19 insertions, 0 deletions
diff --git a/Tools/MiniBrowser/qt/BrowserWindow.cpp b/Tools/MiniBrowser/qt/BrowserWindow.cpp
index 67d5696..53f7de9 100644
--- a/Tools/MiniBrowser/qt/BrowserWindow.cpp
+++ b/Tools/MiniBrowser/qt/BrowserWindow.cpp
@@ -61,6 +61,9 @@ BrowserWindow::BrowserWindow(QWKContext* context, WindowOptions* options)
connect(m_browser->view(), SIGNAL(titleChanged(const QString&)), SLOT(setWindowTitle(const QString&)));
connect(m_browser->view(), SIGNAL(urlChanged(const QUrl&)), SLOT(urlChanged(const QUrl&)));
+ if (m_windowOptions.printLoadedUrls)
+ connect(page(), SIGNAL(urlChanged(QUrl)), this, SLOT(printURL(QUrl)));
+
this->setCentralWidget(m_browser);
m_browser->setFocus(Qt::OtherFocusReason);
@@ -332,6 +335,12 @@ void BrowserWindow::showUserAgentDialog()
page()->setCustomUserAgent(combo->currentText());
}
+void BrowserWindow::printURL(const QUrl& url)
+{
+ QTextStream output(stdout);
+ output << "Loaded: " << url.toString() << endl;
+}
+
void BrowserWindow::toggleDisableJavaScript(bool enable)
{
page()->preferences()->setAttribute(QWKPreferences::JavascriptEnabled, !enable);
diff --git a/Tools/MiniBrowser/qt/BrowserWindow.h b/Tools/MiniBrowser/qt/BrowserWindow.h
index c79b2d0..6ad8f27 100644
--- a/Tools/MiniBrowser/qt/BrowserWindow.h
+++ b/Tools/MiniBrowser/qt/BrowserWindow.h
@@ -69,6 +69,8 @@ protected slots:
void toggleFrameFlattening(bool);
void showUserAgentDialog();
+ void printURL(const QUrl&);
+
void toggleAutoLoadImages(bool);
void toggleDisableJavaScript(bool);
diff --git a/Tools/MiniBrowser/qt/MiniBrowser.pro b/Tools/MiniBrowser/qt/MiniBrowser.pro
index 0038823..809c934 100644
--- a/Tools/MiniBrowser/qt/MiniBrowser.pro
+++ b/Tools/MiniBrowser/qt/MiniBrowser.pro
@@ -56,6 +56,8 @@ contains(QT_CONFIG, opengl) {
DEFINES += QT_CONFIGURED_WITH_OPENGL
}
+DEFINES -= QT_ASCII_CAST_WARNINGS
+
# We copy the resource file to the build directory.
# The copier is defined in Tools/MiniBrowser/DerivedSources.pro.
RESOURCES += \
diff --git a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
index d68d299..f40c870 100644
--- a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
+++ b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
@@ -60,6 +60,7 @@ void MiniBrowserApplication::handleUserOptions()
<< "[-robot-extra-time seconds]"
<< "[-chunked-drawing-area]"
<< "[-separate-web-process-per-window]"
+ << "[-print-loaded-urls]"
<< "URLs";
appQuit(0);
}
@@ -92,4 +93,7 @@ void MiniBrowserApplication::handleUserOptions()
if (args.contains("-separate-web-process-per-window"))
m_windowOptions.useSeparateWebProcessPerWindow = true;
+
+ if (args.contains("-print-loaded-urls"))
+ m_windowOptions.printLoadedUrls = true;
}
diff --git a/Tools/MiniBrowser/qt/MiniBrowserApplication.h b/Tools/MiniBrowser/qt/MiniBrowserApplication.h
index 45dbde9..5a78820 100644
--- a/Tools/MiniBrowser/qt/MiniBrowserApplication.h
+++ b/Tools/MiniBrowser/qt/MiniBrowserApplication.h
@@ -36,11 +36,13 @@ struct WindowOptions {
WindowOptions()
: useTiledBackingStore(true)
, useSeparateWebProcessPerWindow(false)
+ , printLoadedUrls(false)
{
}
bool useTiledBackingStore;
bool useSeparateWebProcessPerWindow;
+ bool printLoadedUrls;
};
class MiniBrowserApplication : public QApplication {