diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-03 13:12:07 +0100 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-03 13:12:07 +0100 |
| commit | a9fa8187b1a7efe343e0bf2722cde5c0ef5fa77e (patch) | |
| tree | 39a419cdf8f6ee8452280531d2463c470c8e0710 /src/3rdparty/webkit | |
| parent | ad46fadbe343e1b6caf94823237064551ab53c52 (diff) | |
| parent | 787a20b76b7f6e0dd6c7a6331220b46b5eddff79 (diff) | |
| download | qt4-tools-a9fa8187b1a7efe343e0bf2722cde5c0ef5fa77e.tar.gz | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
revert to fromUtf16() usage in fromWCharArray()
Assistant examples: Fix missing QLatin1String.
Added Czech translations.
Webkit: Fix missing namespace.
qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN
qmake: fix warnings
qmake: Remove macro and simplify string expression previously using it
qmake: use isActiveConfig() instead of hand-crafting comparisons
Fix missing namespace.
Assistant: Fix spelling mistakes.
Assistant: Use const references in foreach loops.
optimization: get rid of QString::fromUtf16() usage
document QString::fromUtf16() slowness
remove duplicated calculation of length
remove pointless conditionals
micro-optimization
optimize qhash()
Designer/uic/related examples: Fix source code scanning issues II.
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/PopupMenu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebCore/platform/PopupMenu.h b/src/3rdparty/webkit/WebCore/platform/PopupMenu.h index f2fffb51b7..c150a94932 100644 --- a/src/3rdparty/webkit/WebCore/platform/PopupMenu.h +++ b/src/3rdparty/webkit/WebCore/platform/PopupMenu.h @@ -44,7 +44,9 @@ typedef struct HBITMAP__* HBITMAP; namespace WebCore { class QWebPopup; } +QT_BEGIN_NAMESPACE class QGraphicsProxyWidget; +QT_END_NAMESPACE #elif PLATFORM(GTK) typedef struct _GtkMenu GtkMenu; typedef struct _GtkMenuItem GtkMenuItem; |