From 2119c8f291e586b44f97f757097c2cc047bd61d1 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sat, 22 Dec 2012 13:07:11 -0800
Subject: 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 <QtCore> on Windows, you wouldn't get
it).

For qtypetraits.h, it requires qglobal.h first.

Change-Id: If1ba09a0a29de429a5b87e9878c8ac6a62a443c4
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---
 src/corelib/kernel/qwineventnotifier.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/corelib/kernel/qwineventnotifier.h')

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
-- 
cgit v1.2.3