diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-16 01:40:18 (GMT) |
|---|---|---|
| committer | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-16 01:40:18 (GMT) |
| commit | a7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34 (patch) | |
| tree | 0ccc262ac7d0d825d1a8c6868307affa444a9e75 /src/corelib/tools | |
| parent | 227dd18f0e25ee522e5a4323e849590a314dd4cd (diff) | |
| parent | a4571547a38d68d6778bf0ebfa4dc26cc3d865a3 (diff) | |
| download | Qt-a7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34.zip Qt-a7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34.tar.gz Qt-a7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qhash.h | 1 | ||||
| -rw-r--r-- | src/corelib/tools/qmap.h | 1 | ||||
| -rw-r--r-- | src/corelib/tools/qmargins.cpp | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index 06f6688..b65f1d3 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#undef QT_QHASH_DEBUG QT_MODULE(Core) class QBitArray; diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index 18d1f5c..c1be49a 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -51,7 +51,6 @@ #endif #include <new> -#undef QT_MAP_DEBUG QT_BEGIN_HEADER diff --git a/src/corelib/tools/qmargins.cpp b/src/corelib/tools/qmargins.cpp index f5441a3..58cef4a 100644 --- a/src/corelib/tools/qmargins.cpp +++ b/src/corelib/tools/qmargins.cpp @@ -59,6 +59,8 @@ QT_BEGIN_NAMESPACE QMargin objects can be streamed as well as compared. + \sa qDrawBorderPixmap + */ |