b131503361
Conflicts: configure configure.pri examples/widgets/painting/fontsampler/mainwindow.cpp examples/widgets/painting/fontsampler/mainwindow.h mkspecs/features/moc.prf src/corelib/global/qglobal.h src/gui/text/qtextdocument.cpp Change-Id: Ica65512e00871695190a14ccea5c275b0165f787 |
||
---|---|---|
.. | ||
freebsd_device_post.conf | ||
freebsd_device_pre.conf | ||
linux_arm_device_post.conf | ||
linux_device_post.conf | ||
linux_device_pre.conf |