[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
chang.shu at nokia.com
chang.shu at nokia.com
Wed Dec 22 13:44:08 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4bee913b2029f502e8d58878218526f560d54c83
Author: chang.shu at nokia.com <chang.shu at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 24 16:10:43 2010 +0000
2010-09-24 Chang Shu <chang.shu at nokia.com>
Reviewed by Csaba Osztrogonác.
[Qt] Fix the code to check file existence.
https://bugs.webkit.org/show_bug.cgi?id=46465
* QtTestBrowser/main.cpp:
(main):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68259 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3f67a48..ab2d1f6 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-24 Chang Shu <chang.shu at nokia.com>
+
+ Reviewed by Csaba Osztrogonác.
+
+ [Qt] Fix the code to check file existence.
+ https://bugs.webkit.org/show_bug.cgi?id=46465
+
+ * QtTestBrowser/main.cpp:
+ (main):
+
2010-09-23 Tony Chang <tony at chromium.org>
Unreviewed, rolling out r68232.
diff --git a/WebKitTools/QtTestBrowser/main.cpp b/WebKitTools/QtTestBrowser/main.cpp
index e7f9716..41471fa 100644
--- a/WebKitTools/QtTestBrowser/main.cpp
+++ b/WebKitTools/QtTestBrowser/main.cpp
@@ -233,9 +233,9 @@ int main(int argc, char **argv)
QStringList urls = app.urls();
if (urls.isEmpty()) {
- QString defaultUrl = QString("file://%1/%2").arg(QDir::homePath()).arg(QLatin1String("index.html"));
- if (QDir(defaultUrl).exists())
- urls.append(defaultUrl);
+ QString defaultIndexFile = QString("%1/%2").arg(QDir::homePath()).arg(QLatin1String("index.html"));
+ if (QFile(defaultIndexFile).exists())
+ urls.append(QString("file://") + defaultIndexFile);
else
urls.append("");
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list