Conflicts: src/corelib/codecs/qicucodec.cpp src/dbus/qdbusserver.cpp src/gui/painting/qbezier.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp src/plugins/printsupport/cups/qppdprintdevice.cpp Change-Id: I2703128bb64baf5580fbc2c2061b55b0f0611d2a |
||
|---|---|---|
| .. | ||
| testdata | ||
| .gitignore | ||
| qmake.pro | ||
| testcompiler.cpp | ||
| testcompiler.h | ||
| tst_qmake.cpp | ||