whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Bradley T. Hughes 2012-02-06 16:31:52 +01:00 committed by Qt by Nokia
parent 1564b393fe
commit 4a1f1b9be0
3 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/corelib/global/qcompilerdetection.h
View File

@ -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)

14
src/corelib/global/qsystemdetection.h
View File

@ -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)

2
sync.profile
View File

@ -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}" );