511790fd1a
Conflicts: config_help.txt configure mkspecs/features/uikit/sdk.prf src/corelib/global/qhooks.cpp src/corelib/io/qfilesystemwatcher.cpp src/corelib/io/qlockfile_unix.cpp src/corelib/tools/qalgorithms.h src/gui/kernel/qwindowsysteminterface.h src/gui/text/qtextdocument_p.cpp src/network/access/access.pri src/network/access/qnetworkaccessmanager.cpp src/network/access/qnetworkreplynsurlconnectionimpl.mm src/src.pro src/testlib/qtestcase.cpp src/widgets/kernel/qwidgetbackingstore_p.h src/widgets/styles/qwindowscestyle.cpp src/widgets/styles/qwindowsmobilestyle.cpp tests/auto/corelib/io/qdiriterator/qdiriterator.pro tests/auto/corelib/io/qfileinfo/qfileinfo.pro tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp tools/configure/configureapp.cpp Change-Id: Ibf7fb9c8cf263a810ade82f821345d0725c57c67 |
||
---|---|---|
.. | ||
android | ||
atwrapper | ||
compiler | ||
gestures | ||
lancelot | ||
languagechange | ||
macgui | ||
macnativeevents | ||
macplist | ||
modeltest | ||
networkselftest | ||
qaccessibility | ||
qaccessibilitylinux | ||
qaccessibilitymac | ||
qcomplextext | ||
qfocusevent | ||
qnetworkaccessmanager_and_qprogressdialog | ||
qobjectperformance | ||
qobjectrace | ||
qprocess_and_guieventloop | ||
qsharedpointer_and_qwidget | ||
qtokenautomaton | ||
qvariant_common | ||
toolsupport | ||
other.pro |