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/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 <utility>                  // For pair
-#include "QtCore/qglobal.h"
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE

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