summaryrefslogtreecommitdiffstats
path: root/WebKitTools/MiniBrowser/qt/main.cpp
diff options
context:
space:
mode:
authorIain Merrick <husky@google.com>2010-09-13 16:35:48 +0100
committerIain Merrick <husky@google.com>2010-09-16 12:10:42 +0100
commit5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306 (patch)
treeddce1aa5e3b6967a69691892e500897558ff8ab6 /WebKitTools/MiniBrowser/qt/main.cpp
parent12bec63ec71e46baba27f0bd9bd9d8067683690a (diff)
downloadexternal_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.zip
external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.tar.gz
external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.tar.bz2
Merge WebKit at r67178 : Initial merge by git.
Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
Diffstat (limited to 'WebKitTools/MiniBrowser/qt/main.cpp')
-rw-r--r--WebKitTools/MiniBrowser/qt/main.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/WebKitTools/MiniBrowser/qt/main.cpp b/WebKitTools/MiniBrowser/qt/main.cpp
index 2bc346b..8ff3de8 100644
--- a/WebKitTools/MiniBrowser/qt/main.cpp
+++ b/WebKitTools/MiniBrowser/qt/main.cpp
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <QtGui>
#include "BrowserWindow.h"
+#include <QtGui>
int main(int argc, char** argv) {
QApplication app(argc, argv);
@@ -44,11 +44,11 @@ int main(int argc, char** argv) {
urls.append("http://www.google.com");
}
- BrowserWindow* window = 0;
- foreach (QString url, urls) {
- window = new BrowserWindow();
- window->newWindow(url);
- }
+ BrowserWindow* window = new BrowserWindow();
+ window->load(urls[0]);
+
+ for (int i = 1; i < urls.size(); ++i)
+ window->newWindow(urls[i]);
app.exec();