diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-09-22 14:55:00 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-09-22 14:55:00 +0200 |
| commit | 9a5a12a5fe5bdf848756ddad20dabe288a6873de (patch) | |
| tree | 4116fe2b23d8689f7f10688d338c7fc8abe46b1e /src/qt3support | |
| parent | 0d446ec758aacd131f2da0fa67a081fd93cff898 (diff) | |
| parent | b7ba409b0dabd382876310a6c110a96cf0e3c6bf (diff) | |
| download | qt4-tools-9a5a12a5fe5bdf848756ddad20dabe288a6873de.tar.gz | |
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/qt3support')
| -rw-r--r-- | src/qt3support/dialogs/q3filedialog.cpp | 1 | ||||
| -rw-r--r-- | src/qt3support/text/q3richtext.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/qt3support/dialogs/q3filedialog.cpp b/src/qt3support/dialogs/q3filedialog.cpp index 35f7890efe..f9dfaa155d 100644 --- a/src/qt3support/dialogs/q3filedialog.cpp +++ b/src/qt3support/dialogs/q3filedialog.cpp @@ -106,7 +106,6 @@ #ifdef Q_WS_MAC #include "qmacstyle_mac.h" #include "private/qt_mac_p.h" -#include "private/qunicodetables_p.h" #undef check #endif diff --git a/src/qt3support/text/q3richtext.cpp b/src/qt3support/text/q3richtext.cpp index 625dd95ab2..d84a85b4d6 100644 --- a/src/qt3support/text/q3richtext.cpp +++ b/src/qt3support/text/q3richtext.cpp @@ -64,7 +64,6 @@ #include "q3stylesheet.h" #include "qtextstream.h" #include <private/qtextengine_p.h> -#include <private/qunicodetables_p.h> #include <stdlib.h> |