diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-01 14:02:36 +0100 |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-01 14:02:36 +0100 |
commit | 0533cd3a773952490eb0e5686afb7b235799a13f (patch) | |
tree | a1f14fe42a51499666921d58a6a5b62f1f916d8e /src/corelib/tools/qsharedpointer_impl.h | |
parent | 9c132451acc7fbed1611fd3676cceb26e815f50d (diff) | |
parent | e5974b024828578945bd4c349f5f87f82a635225 (diff) | |
download | qt4-tools-0533cd3a773952490eb0e5686afb7b235799a13f.tar.gz |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
mkspecs/features/symbian/application_icon.prf
src/sql/drivers/odbc/qsql_odbc.cpp
Diffstat (limited to 'src/corelib/tools/qsharedpointer_impl.h')
-rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 273c5bdb6a..b29e5b69e3 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -44,7 +44,17 @@ #ifndef QSHAREDPOINTER_H #error Do not include qsharedpointer_impl.h directly #endif + #if 0 +// These macros are duplicated here to make syncqt not complain a about +// this header, as we have a "qt_sync_stop_processing" below, which in turn +// is here because this file contains a template mess and duplicates the +// classes found in qsharedpointer.h +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE +QT_MODULE(Core) +QT_END_NAMESPACE +QT_END_HEADER #pragma qt_sync_stop_processing #endif |