diff options
author | Kristian Monsen <kristianm@google.com> | 2010-09-08 12:18:00 +0100 |
---|---|---|
committer | Kristian Monsen <kristianm@google.com> | 2010-09-11 12:08:58 +0100 |
commit | 5ddde30071f639962dd557c453f2ad01f8f0fd00 (patch) | |
tree | 775803c4ab35af50aa5f5472cd1fb95fe9d5152d /WebKitTools/MiniBrowser/qt/main.cpp | |
parent | 3e63d9b33b753ca86d0765d1b3d711114ba9e34f (diff) | |
download | external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.zip external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.gz external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.bz2 |
Merge WebKit at r66666 : Initial merge by git.
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
Diffstat (limited to 'WebKitTools/MiniBrowser/qt/main.cpp')
-rw-r--r-- | WebKitTools/MiniBrowser/qt/main.cpp | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/WebKitTools/MiniBrowser/qt/main.cpp b/WebKitTools/MiniBrowser/qt/main.cpp index b261397..2bc346b 100644 --- a/WebKitTools/MiniBrowser/qt/main.cpp +++ b/WebKitTools/MiniBrowser/qt/main.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) + * Copyright (C) 2010 University of Szeged * * All rights reserved. * @@ -31,10 +32,23 @@ int main(int argc, char** argv) { QApplication app(argc, argv); - BrowserWindow window; - window.resize(960, 640); - window.show(); - window.load(argc > 1 ? argv[1] : "http://www.google.com"); + QStringList args = QApplication::arguments(); + QStringList urls = args; + urls.removeAt(0); + + if (urls.isEmpty()) { + QString defaultUrl = QString("file://%1/%2").arg(QDir::homePath()).arg(QLatin1String("index.html")); + if (QDir(defaultUrl).exists()) + urls.append(defaultUrl); + else + urls.append("http://www.google.com"); + } + + BrowserWindow* window = 0; + foreach (QString url, urls) { + window = new BrowserWindow(); + window->newWindow(url); + } app.exec(); |