From 3d84b592ded2e02c8e507eb67a0278aaf5372651 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Fri, 27 Jan 2012 12:57:46 +0100 Subject: [PATCH] Fixed includes in public headers Change-Id: I360c94d41691a618f1bec97da8317c9dcee658c0 Reviewed-by: Lars Knoll --- src/corelib/json/qjsonarray.h | 2 +- src/corelib/json/qjsondocument.h | 2 +- src/corelib/json/qjsonobject.h | 2 +- src/corelib/json/qjsonvalue.h | 4 ++-- src/corelib/thread/qbasicatomic.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/json/qjsonarray.h b/src/corelib/json/qjsonarray.h index e296458cb0..ff679c06a8 100644 --- a/src/corelib/json/qjsonarray.h +++ b/src/corelib/json/qjsonarray.h @@ -42,7 +42,7 @@ #ifndef QJSONARRAY_H #define QJSONARRAY_H -#include +#include QT_BEGIN_HEADER diff --git a/src/corelib/json/qjsondocument.h b/src/corelib/json/qjsondocument.h index 0994a80f22..944ced7b96 100644 --- a/src/corelib/json/qjsondocument.h +++ b/src/corelib/json/qjsondocument.h @@ -42,7 +42,7 @@ #ifndef QJSONDOCUMENT_H #define QJSONDOCUMENT_H -#include +#include QT_BEGIN_HEADER diff --git a/src/corelib/json/qjsonobject.h b/src/corelib/json/qjsonobject.h index 12e2bca33a..fcd9807fad 100644 --- a/src/corelib/json/qjsonobject.h +++ b/src/corelib/json/qjsonobject.h @@ -42,7 +42,7 @@ #ifndef QJSONOBJECT_H #define QJSONOBJECT_H -#include +#include QT_BEGIN_HEADER diff --git a/src/corelib/json/qjsonvalue.h b/src/corelib/json/qjsonvalue.h index 6efb50b81d..76ef5caa7e 100644 --- a/src/corelib/json/qjsonvalue.h +++ b/src/corelib/json/qjsonvalue.h @@ -42,8 +42,8 @@ #ifndef QJSONVALUE_H #define QJSONVALUE_H -#include -#include +#include +#include QT_BEGIN_HEADER diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index a39ed0d56a..a9a3fe92c6 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -63,7 +63,7 @@ #endif #ifdef QT_OLD_ATOMICS -# include "qoldbasicatomic.h" +# include "QtCore/qoldbasicatomic.h" # undef QT_OLD_ATOMICS #else