diff options
| author | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2013-02-01 13:02:47 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-06 14:38:24 +0100 |
| commit | 8a34cdf6308b8fa4d422bd291bc6fa94048c4871 (patch) | |
| tree | 12592fc5f60955b7f40d1e38ed2546f9a99f03ad /src/imports | |
| parent | dfbe0f25d3ab3365971caecee513aa1272ed086f (diff) | |
Remove use of QT_{BEGIN,END}_HEADER macros.
These macros were removed from Qt Core and they are no longer defined
causing qtsystems to fail to build.
Change-Id: I0e08e7a53f20a016e403d9022e349b25ba38a7ec
Reviewed-by: Andrew Stanley-Jones <asj@cban.com>
Diffstat (limited to 'src/imports')
6 files changed, 0 insertions, 12 deletions
diff --git a/src/imports/systeminfo/qdeclarativebatteryinfo_p.h b/src/imports/systeminfo/qdeclarativebatteryinfo_p.h index 95c990c2..0fc104e3 100644 --- a/src/imports/systeminfo/qdeclarativebatteryinfo_p.h +++ b/src/imports/systeminfo/qdeclarativebatteryinfo_p.h @@ -55,7 +55,6 @@ #include <qbatteryinfo.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QDeclarativeBatteryInfo : public QObject @@ -186,6 +185,5 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // QDECLARATIVEBATTERYINFO_P_H diff --git a/src/imports/systeminfo/qdeclarativedeviceinfo_p.h b/src/imports/systeminfo/qdeclarativedeviceinfo_p.h index 2fd68cd4..c857cf3f 100644 --- a/src/imports/systeminfo/qdeclarativedeviceinfo_p.h +++ b/src/imports/systeminfo/qdeclarativedeviceinfo_p.h @@ -55,7 +55,6 @@ #include <qdeviceinfo.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QDeclarativeDeviceInfo : public QObject @@ -148,6 +147,5 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // QDECLARATIVEDEVICEINFO_P_H diff --git a/src/imports/systeminfo/qdeclarativedeviceprofile_p.h b/src/imports/systeminfo/qdeclarativedeviceprofile_p.h index 424c6b69..34ac3e18 100644 --- a/src/imports/systeminfo/qdeclarativedeviceprofile_p.h +++ b/src/imports/systeminfo/qdeclarativedeviceprofile_p.h @@ -55,7 +55,6 @@ #include <qdeviceprofile.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QDeclarativeDeviceProfile : public QObject @@ -96,6 +95,5 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // QDECLARATIVEDEVICEPROFILE_P_H diff --git a/src/imports/systeminfo/qdeclarativedisplayinfo_p.h b/src/imports/systeminfo/qdeclarativedisplayinfo_p.h index 664f8c19..6bfff9f5 100644 --- a/src/imports/systeminfo/qdeclarativedisplayinfo_p.h +++ b/src/imports/systeminfo/qdeclarativedisplayinfo_p.h @@ -55,7 +55,6 @@ #include <qdisplayinfo.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QDeclarativeDisplayInfo : public QObject @@ -96,6 +95,5 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // QDECLARATIVEDISPLAYINFO_P_H diff --git a/src/imports/systeminfo/qdeclarativenetworkinfo_p.h b/src/imports/systeminfo/qdeclarativenetworkinfo_p.h index de34ba01..afe0acc0 100644 --- a/src/imports/systeminfo/qdeclarativenetworkinfo_p.h +++ b/src/imports/systeminfo/qdeclarativenetworkinfo_p.h @@ -55,7 +55,6 @@ #include <qnetworkinfo.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QDeclarativeNetworkInfo : public QObject @@ -208,6 +207,5 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // QDECLARATIVENETWORKINFO_P_H diff --git a/src/imports/systeminfo/qdeclarativestorageinfo_p.h b/src/imports/systeminfo/qdeclarativestorageinfo_p.h index db697ae0..d836269f 100644 --- a/src/imports/systeminfo/qdeclarativestorageinfo_p.h +++ b/src/imports/systeminfo/qdeclarativestorageinfo_p.h @@ -55,7 +55,6 @@ #include <qstorageinfo.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QDeclarativeStorageInfo : public QObject @@ -101,6 +100,5 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // QDECLARATIVESTORAGEINFO_P_H |