From 2119c8f291e586b44f97f757097c2cc047bd61d1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 22 Dec 2012 13:07:11 -0800 Subject: [PATCH] Make these headers includable directly, on all systems For qwineventnotifier.h, just wrap the code around #ifdef Q_OS_WIN. This has the added benefit of fixing the current qt_no_master_include problem (that is, even if you #include on Windows, you wouldn't get it). For qtypetraits.h, it requires qglobal.h first. Change-Id: If1ba09a0a29de429a5b87e9878c8ac6a62a443c4 Reviewed-by: Laszlo Papp Reviewed-by: Olivier Goffart --- src/corelib/global/qtypetraits.h | 3 ++- src/corelib/kernel/qwineventnotifier.h | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/global/qtypetraits.h b/src/corelib/global/qtypetraits.h index 0183f33738..54b48667b4 100644 --- a/src/corelib/global/qtypetraits.h +++ b/src/corelib/global/qtypetraits.h @@ -102,11 +102,12 @@ // - Use Qt macros for long long type differences on Windows. // - Enclose in QtPrivate namespace. +#include "QtCore/qglobal.h" + #ifndef QTYPETRAITS_H #define QTYPETRAITS_H #include // For pair -#include "QtCore/qglobal.h" QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/corelib/kernel/qwineventnotifier.h b/src/corelib/kernel/qwineventnotifier.h index d5e4d0f7e3..291d953e58 100644 --- a/src/corelib/kernel/qwineventnotifier.h +++ b/src/corelib/kernel/qwineventnotifier.h @@ -42,12 +42,9 @@ #ifndef QWINEVENTNOTIFIER_H #define QWINEVENTNOTIFIER_H -#if 0 -// inform syncqt -#pragma qt_no_master_include -#endif - #include "QtCore/qobject.h" + +#ifdef Q_OS_WIN #include "QtCore/qt_windows.h" QT_BEGIN_HEADER @@ -88,4 +85,6 @@ QT_END_NAMESPACE QT_END_HEADER +#endif // Q_OS_WIN + #endif // QWINEVENTNOTIFIER_H