diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-09-22 12:55:00 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-09-22 12:55:00 (GMT) |
| commit | 9a5a12a5fe5bdf848756ddad20dabe288a6873de (patch) | |
| tree | 4116fe2b23d8689f7f10688d338c7fc8abe46b1e /src/corelib/io/qurl.cpp | |
| parent | 0d446ec758aacd131f2da0fa67a081fd93cff898 (diff) | |
| parent | b7ba409b0dabd382876310a6c110a96cf0e3c6bf (diff) | |
| download | Qt-9a5a12a5fe5bdf848756ddad20dabe288a6873de.zip Qt-9a5a12a5fe5bdf848756ddad20dabe288a6873de.tar.gz Qt-9a5a12a5fe5bdf848756ddad20dabe288a6873de.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/painting/qtextureglyphcache_p.h
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
Diffstat (limited to 'src/corelib/io/qurl.cpp')
| -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 b122cd2..6452c0f 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" |