f34e73a16a
Conflicts: src/corelib/kernel/qobject.cpp src/gui/painting/qpaintengine_raster.cpp Change-Id: I74e1779832f43d033708dcfd6b666c7b4f0111fb |
||
---|---|---|
.. | ||
Info.plist.app | ||
Info.plist.lib | ||
qmake.conf | ||
qplatformdefs.h |
f34e73a16a
Conflicts: src/corelib/kernel/qobject.cpp src/gui/painting/qpaintengine_raster.cpp Change-Id: I74e1779832f43d033708dcfd6b666c7b4f0111fb |
||
---|---|---|
.. | ||
Info.plist.app | ||
Info.plist.lib | ||
qmake.conf | ||
qplatformdefs.h |