diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:52:15 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:52:15 +0200 |
| commit | 0fd4ec1f79ce808f51a6d435c20739c8c40abd77 (patch) | |
| tree | 2051cbdb74c9f434b70185da721ed447c37a3fb9 /examples/webkitwidgets/browser/main.cpp | |
| parent | c8e7417c3a8366ac423efef73b6d97cea70ada61 (diff) | |
| parent | bce5056b9e16a943357e362455a46685d3f22093 (diff) | |
| download | qtwebkit-examples-0fd4ec1f79ce808f51a6d435c20739c8c40abd77.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: If9c3bf3632b0203818aefd12a973f08d60908c91
Diffstat (limited to 'examples/webkitwidgets/browser/main.cpp')
| -rw-r--r-- | examples/webkitwidgets/browser/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/webkitwidgets/browser/main.cpp b/examples/webkitwidgets/browser/main.cpp index ae54456..fac3d01 100644 --- a/examples/webkitwidgets/browser/main.cpp +++ b/examples/webkitwidgets/browser/main.cpp @@ -45,7 +45,7 @@ int main(int argc, char **argv) { Q_INIT_RESOURCE(data); BrowserApplication application(argc, argv); - if (!application.isTheOnlyBrowser()) + if (!application.isTheOnlyBrowser() || !application.isCorrectlyInitialized()) return 0; application.newMainWindow(); return application.exec(); |