Merge remote-tracking branch 'origin/api_changes'

Conflicts:
	dist/changes-5.0.0
	mkspecs/features/qt_module_config.prf
	qmake/project.cpp
	qmake/property.cpp

Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296

1 files changed, 2 insertions, 1 deletions

diff --git a/src/corelib/kernel/qeventdispatcher_win_p.h b/src/corelib/kernel/qeventdispatcher_win_p.h
index c404967e6a..565f1ef4b3 100644
--- a/src/corelib/kernel/qeventdispatcher_win_p.h
+++ b/src/corelib/kernel/qeventdispatcher_win_p.h
@@ -55,6 +55,7 @@
 
 #include "QtCore/qabstracteventdispatcher.h"
 #include "QtCore/qt_windows.h"
+#include "QtCore/qhash.h"
 
 #include "qabstracteventdispatcher_p.h"
 
@@ -130,7 +131,7 @@ struct WinTimerInfo {                           // internal timer info
 class QZeroTimerEvent : public QTimerEvent
 {
 public:
-    inline QZeroTimerEvent(int timerId)
+    explicit inline QZeroTimerEvent(int timerId)
         : QTimerEvent(timerId)
     { t = QEvent::ZeroTimerEvent; }
 };