diff options
| -rw-r--r-- | src/svg/qgraphicssvgitem.h | 4 | ||||
| -rw-r--r-- | src/svg/qsvgfunctions_wince.cpp | 2 | ||||
| -rw-r--r-- | src/svg/qsvgfunctions_wince_p.h (renamed from src/svg/qsvgfunctions_wince.h) | 19 | ||||
| -rw-r--r-- | src/svg/qsvggenerator.h | 4 | ||||
| -rw-r--r-- | src/svg/qsvgrenderer.h | 4 | ||||
| -rw-r--r-- | src/svg/qsvgwidget.h | 4 | ||||
| -rw-r--r-- | src/svg/qtsvgglobal.h | 4 | ||||
| -rw-r--r-- | src/svg/svg.pro | 2 | ||||
| -rw-r--r-- | sync.profile | 2 |
9 files changed, 19 insertions, 26 deletions
diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h index 96f3df3..09cda2a 100644 --- a/src/svg/qgraphicssvgitem.h +++ b/src/svg/qgraphicssvgitem.h @@ -49,8 +49,6 @@ #include <QtSvg/qtsvgglobal.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -98,8 +96,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_WIDGETS #endif // QGRAPHICSSVGITEM_H diff --git a/src/svg/qsvgfunctions_wince.cpp b/src/svg/qsvgfunctions_wince.cpp index f3aa204..59f7157 100644 --- a/src/svg/qsvgfunctions_wince.cpp +++ b/src/svg/qsvgfunctions_wince.cpp @@ -47,7 +47,7 @@ #include <altcecrt.h> #include "qplatformdefs.h" -#include "qfunctions_wince.h" +#include "qfunctions_wince_p.h" #include "qstring.h" #include "qbytearray.h" #include "qhash.h" diff --git a/src/svg/qsvgfunctions_wince.h b/src/svg/qsvgfunctions_wince_p.h index 4cc9064..e8b770c 100644 --- a/src/svg/qsvgfunctions_wince.h +++ b/src/svg/qsvgfunctions_wince_p.h @@ -39,8 +39,21 @@ ** ****************************************************************************/ -#ifndef QSVGFUNCTIONS_WCE_H -#define QSVGFUNCTIONS_WCE_H +#ifndef QSVGFUNCTIONS_WCE_P_H +#define QSVGFUNCTIONS_WCE_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtCore/qglobal.h> #ifdef Q_OS_WINCE @@ -81,4 +94,4 @@ int qt_wince__read(int handle, void *buffer, unsigned int count); int qt_wince__write(int handle, const void *buffer, unsigned int count); #endif // Q_OS_WINCE -#endif // QSVGFUNCTIONS_WCE_H +#endif // QSVGFUNCTIONS_WCE_P_H diff --git a/src/svg/qsvggenerator.h b/src/svg/qsvggenerator.h index 8b88ca6..44e9ced 100644 --- a/src/svg/qsvggenerator.h +++ b/src/svg/qsvggenerator.h @@ -52,8 +52,6 @@ #include <QtCore/qscopedpointer.h> #include <QtSvg/qtsvgglobal.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -106,7 +104,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_SVGGENERATOR #endif // QSVGGENERATOR_H diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h index 6b12a30..395f093 100644 --- a/src/svg/qsvgrenderer.h +++ b/src/svg/qsvgrenderer.h @@ -52,8 +52,6 @@ #include <QtCore/qxmlstream.h> #include <QtSvg/qtsvgglobal.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -114,7 +112,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_SVGRENDERER #endif // QSVGRENDERER_H diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h index 560bace..e91b974 100644 --- a/src/svg/qsvgwidget.h +++ b/src/svg/qsvgwidget.h @@ -50,8 +50,6 @@ #include <QtSvg/qtsvgglobal.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -82,8 +80,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_WIDGETS #endif // QSVGWIDGET_H diff --git a/src/svg/qtsvgglobal.h b/src/svg/qtsvgglobal.h index ace2053..3779679 100644 --- a/src/svg/qtsvgglobal.h +++ b/src/svg/qtsvgglobal.h @@ -44,8 +44,6 @@ #include <QtCore/qglobal.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef Q_SVG_EXPORT @@ -62,6 +60,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/svg/svg.pro b/src/svg/svg.pro index 8ee9061..ee18997 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -41,7 +41,7 @@ wince*: { SOURCES += \ qsvgfunctions_wince.cpp HEADERS += \ - qsvgfunctions_wince.h + qsvgfunctions_wince_p.h } contains(QT_CONFIG, system-zlib) { diff --git a/sync.profile b/sync.profile index 915cf73..f0fe925 100644 --- a/sync.profile +++ b/sync.profile @@ -10,5 +10,5 @@ # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) # %dependencies = ( - "qtbase" => "refs/heads/stable", + "qtbase" => "refs/heads/dev", ); |