remove qt_windows.h include from qwineventnotifier.h
We must not include qt_windows.h in public headers, otherwise we're cluttering the environment with a colorful bouquet of Windows API preprocessor macros and typedefs. Task-number: QTBUG-34058 Change-Id: I415717ea2a47f39e7f4b7ce1c1df9d49afc99278 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
parent
5dfda7a556
commit
721ec98501
@ -45,7 +45,6 @@
|
||||
#include "QtCore/qobject.h"
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
#include "QtCore/qt_windows.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
@ -54,6 +53,7 @@ class Q_CORE_EXPORT QWinEventNotifier : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_DECLARE_PRIVATE(QWinEventNotifier)
|
||||
typedef Qt::HANDLE HANDLE;
|
||||
|
||||
public:
|
||||
explicit QWinEventNotifier(QObject *parent = 0);
|
||||
|
@ -42,6 +42,7 @@
|
||||
#include <QtTest/QtTest>
|
||||
#include <qwineventnotifier.h>
|
||||
#include <qtimer.h>
|
||||
#include <qt_windows.h>
|
||||
|
||||
class tst_QWinEventNotifier : public QObject
|
||||
{
|
||||
|
@ -48,7 +48,7 @@
|
||||
#include <private/qdatetime_p.h>
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
# include <windows.h>
|
||||
# include <qt_windows.h>
|
||||
#endif
|
||||
|
||||
class tst_QDateTime : public QObject
|
||||
|
Loading…
Reference in New Issue
Block a user