diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-30 15:42:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-10-07 10:59:29 +0100 |
| commit | bec39347bb3bb5bf1187ccaf471d26247f28b585 (patch) | |
| tree | 56bdc4c2978fbfd3d79d0d36d5d6c640ecc09cc8 /WebKitTools/QtTestBrowser/utils.cpp | |
| parent | 90b7966e7815b262cd19ac25f03aaad9b21fdc06 (diff) | |
| download | external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.zip external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.tar.gz external_webkit-bec39347bb3bb5bf1187ccaf471d26247f28b585.tar.bz2 | |
Merge WebKit at r68651 : Initial merge by git.
Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
Diffstat (limited to 'WebKitTools/QtTestBrowser/utils.cpp')
| -rw-r--r-- | WebKitTools/QtTestBrowser/utils.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/WebKitTools/QtTestBrowser/utils.cpp b/WebKitTools/QtTestBrowser/utils.cpp index 2d45dd0..567c989 100644 --- a/WebKitTools/QtTestBrowser/utils.cpp +++ b/WebKitTools/QtTestBrowser/utils.cpp @@ -82,11 +82,7 @@ QUrl urlFromUserInput(const QString& string) if (fi.exists() && fi.isRelative()) input = fi.absoluteFilePath(); -#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0) return QUrl::fromUserInput(input); -#else - return QUrl(input); -#endif } |