From 4a1f1b9be003ecaa06a5410a9b7c4a66641f7f03 Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Mon, 6 Feb 2012 16:31:52 +0100
Subject: [PATCH] Make syncqt ignore qsystemdetection.h and
 qcompilerdetection.h

Remove the #if 0'd blocks and instead add these headers to
sync.profile's @ignore_for_include_check, as documented at

http://wiki.qt-project.org/Creating_a_new_module_or_tool_for_Qt#other_fields

Change-Id: I3bd6e8cb21eca139fdca10fe970eeaf2e4e77c24
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 src/corelib/global/qcompilerdetection.h | 14 --------------
 src/corelib/global/qsystemdetection.h   | 14 --------------
 sync.profile                            |  2 +-
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h
index 7621b76..5ab7909 100644
--- a/src/corelib/global/qcompilerdetection.h
+++ b/src/corelib/global/qcompilerdetection.h
@@ -42,20 +42,6 @@
 #ifndef QCOMPILERDETECTION_H
 #define QCOMPILERDETECTION_H
 
-#if 0
-// header is automatically included in qglobal.h
-#pragma qt_no_master_include
-
-// silence syncqt warnings (QT_* macros are not yet defined)
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
-
-QT_END_NAMESPACE
-QT_END_HEADER
-
-#pragma qt_sync_stop_processing
-#endif
-
 /*
    The compiler, must be one of: (Q_CC_x)
 
diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h
index 11df62b..0228bc9 100644
--- a/src/corelib/global/qsystemdetection.h
+++ b/src/corelib/global/qsystemdetection.h
@@ -42,20 +42,6 @@
 #ifndef QSYSTEMDETECTION_H
 #define QSYSTEMDETECTION_H
 
-#if 0
-// header is automatically included in qglobal.h
-#pragma qt_no_master_include
-
-// silence syncqt warnings (QT_* macros are not yet defined)
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
-
-QT_END_NAMESPACE
-QT_END_HEADER
-
-#pragma qt_sync_stop_processing
-#endif
-
 /*
    The operating system, must be one of: (Q_OS_x)
 
diff --git a/sync.profile b/sync.profile
index 446f8f4..4f01b7c 100644
--- a/sync.profile
+++ b/sync.profile
@@ -77,7 +77,7 @@
 );
 
 @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" );
-@ignore_for_include_check = ( "qatomic.h" );
+@ignore_for_include_check = ( "qsystemdetection.h", "qcompilerdetection.h" );
 @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" );
 @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" );
 @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtTest}", "$modules{QtDBus}" );
-- 
2.7.4