diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 09:21:30 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 09:22:03 +0100 |
commit | 914530faf25767a9a5ae7b35423661c4438a356e (patch) | |
tree | cf39ce5f445c9503d55209e915343efd7716c0f8 /src/designer/src/lib/sdk/sdk_global.h | |
parent | f212e46fe930ee89a8cb52beeeccc03369c015a1 (diff) | |
parent | 8b725e3f41e244c9f3d65a701c7242369fd88e11 (diff) | |
download | qttools-914530faf25767a9a5ae7b35423661c4438a356e.tar.gz |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Change-Id: I359d5bfaa62a4d37a2deec79f80963ae5c19d918
Diffstat (limited to 'src/designer/src/lib/sdk/sdk_global.h')
-rw-r--r-- | src/designer/src/lib/sdk/sdk_global.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/designer/src/lib/sdk/sdk_global.h b/src/designer/src/lib/sdk/sdk_global.h index 8eb0d0a31..3621b660e 100644 --- a/src/designer/src/lib/sdk/sdk_global.h +++ b/src/designer/src/lib/sdk/sdk_global.h @@ -44,7 +44,6 @@ #include <QtCore/qglobal.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #define QDESIGNER_SDK_EXTERN Q_DECL_EXPORT @@ -59,6 +58,5 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER #endif // SDK_GLOBAL_H |