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 |
||
|---|---|---|
| .. | ||
| BLACKLIST | ||
| qtouchevent.pro | ||
| tst_qtouchevent.cpp | ||