4a8273a6fc
For the conflicts in msvc_nmake.cpp the ifdefs are extended since we need to support windows phone in the target branch while it is not there in the current stable branch (as of Qt 5.2). Conflicts: configure qmake/generators/win32/msvc_nmake.cpp src/3rdparty/angle/src/libEGL/Surface.cpp src/angle/src/common/common.pri src/corelib/global/qglobal.h src/corelib/io/qstandardpaths.cpp src/plugins/platforms/qnx/qqnxintegration.cpp src/plugins/platforms/qnx/qqnxscreeneventhandler.h src/plugins/platforms/xcb/qglxintegration.h src/widgets/kernel/win.pri tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp tools/configure/configureapp.cpp Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812 |
||
---|---|---|
.. | ||
aggregate | ||
dbus | ||
embedded | ||
gestures | ||
gui | ||
ipc | ||
json | ||
network | ||
opengl | ||
qmake | ||
qpa | ||
qtconcurrent | ||
qtestlib | ||
sql | ||
threads | ||
tools | ||
touch | ||
webkit/webkit-guide | ||
widgets | ||
xml | ||
examples.pro | ||
README |
Qt is supplied with a number of example applications that have been written to provide developers with examples of the Qt API in use, highlight good programming practice, and showcase features found in each of Qt's core technologies. Documentation for examples can be found in the Examples section of the Qt documentation.