diff options
author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-22 22:00:24 (GMT) |
---|---|---|
committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-22 22:00:24 (GMT) |
commit | 447e86bc09c70be941164158bb1f760d1b9bf80a (patch) | |
tree | 267b6afc1b2d84f759ca03759dad20efdf5cfd00 /src/corelib/io | |
parent | f1b0195c3ed4f18894273e279ecdcc840dea31bb (diff) | |
parent | bb878bb1ee9a5272359e88d44806971e13c31486 (diff) | |
download | Qt-447e86bc09c70be941164158bb1f760d1b9bf80a.zip Qt-447e86bc09c70be941164158bb1f760d1b9bf80a.tar.gz Qt-447e86bc09c70be941164158bb1f760d1b9bf80a.tar.bz2 |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qurl.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index d1fab2d..6a3037d 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -176,7 +176,6 @@ */ #include "qplatformdefs.h" #include "qurl.h" -#include "private/qunicodetables_p.h" #include "qatomic.h" #include "qbytearray.h" #include "qdir.h" |