Liang Qi 4fe2fbcf82 Merge remote-tracking branch 'origin/5.6' into 5.7 ... This also reverts commit 018e670a26. The change was introduced in 5.6. After the refactoring, 14960f52, in 5.7 branch and a merge, it is not needed any more. Conflicts: .qmake.conf src/corelib/io/qstandardpaths_mac.mm src/corelib/tools/qsharedpointer_impl.h tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp Change-Id: If4fdff0ebf2b9b5df9f9db93ea0022d5ee3da2a4		2016-02-18 20:50:35 +01:00
..
BLACKLIST	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-18 20:50:35 +01:00
qwindow.pro	fix usage of wince scope	2015-06-05 10:29:10 +00:00
tst_qwindow.cpp	Revert "QWindow::destroy(): only reset QGuiApp::focus_window and friends as a last resort"	2016-02-02 02:12:26 +00:00