Merge master into api_changes

Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1

diff --cc configure
Simple merge

diff --cc src/corelib/kernel/qcoreevent.h
Simple merge

diff --cc src/corelib/kernel/qobject.cpp
Simple merge

diff --cc src/corelib/tools/qstring.cpp
Simple merge

diff --cc src/corelib/tools/tools.pri
Simple merge

diff --cc src/gui/kernel/qevent.cpp
Simple merge

diff --cc src/gui/kernel/qevent.h
Simple merge

diff --cc src/gui/kernel/qguiapplication.cpp
Simple merge

diff --cc src/gui/kernel/qwindow.cpp
Simple merge

diff --cc src/gui/kernel/qwindowsysteminterface_qpa.cpp
Simple merge

diff --cc src/opengl/qgl.cpp
Simple merge

diff --cc src/widgets/itemviews/qlistview.cpp
Simple merge

diff --cc src/widgets/itemviews/qtreeview.cpp
Simple merge

diff --cc src/widgets/kernel/qapplication.h
Simple merge

diff --cc src/widgets/kernel/qwidget.cpp
Simple merge

diff --cc src/widgets/kernel/qwidgetwindow_qpa.cpp
Simple merge

diff --cc src/widgets/styles/qwindowsstyle.cpp
Simple merge

diff --cc src/widgets/styles/qwindowsxpstyle.cpp
Simple merge

diff --cc src/widgets/widgets/qtabbar.cpp
Simple merge

diff --cc tests/auto/corelib/kernel/qobject/test/test.pro
index 9daf3d7,c08f910..824223d
--- 1/tests/auto/corelib/kernel/qobject/test/test.pro
--- 2/tests/auto/corelib/kernel/qobject/test/test.pro
+++ b/tests/auto/corelib/kernel/qobject/test/test.pro
@@@ -3,5 -3,9 +3,5 @@@ TARGET = ../tst_qobjec
  QT = core-private network testlib
  SOURCES = ../tst_qobject.cpp
  
 -# this is here for a reason, moc_oldnormalizedobject.cpp is not auto-generated, it was generated by
 -# moc from Qt 4.6, and should *not* be generated by the current moc
 -SOURCES += ../moc_oldnormalizeobject.cpp
 -
  load(testcase) # for target.path and installTestHelperApp()
- installTestHelperApp("signalbug/signalbug",signalbug,signalbug)
+ installTestHelperApp("../signalbug/signalbug",signalbug,signalbug)