34b14a8472
Conflicts: examples/xml/htmlinfo/simpleexample.html examples/xml/rsslisting/rsslisting.cpp qmake/generators/win32/msbuild_objectmodel.cpp src/3rdparty/harfbuzz-ng/src/hb-private.hh src/corelib/global/qlogging.cpp src/corelib/io/qstorageinfo_unix.cpp src/corelib/thread/qwaitcondition_unix.cpp src/gui/kernel/qguiapplication.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp src/testlib/doc/src/qt-webpages.qdoc tests/auto/other/qaccessibility/tst_qaccessibility.cpp Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff |
||
---|---|---|
.. | ||
android | ||
atwrapper | ||
baselineexample | ||
compiler | ||
gestures | ||
headersclean | ||
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 | ||
windowsmobile | ||
other.pro |