Conflicts: mkspecs/win32-clang-msvc/qmake.conf src/gui/image/qpnghandler.cpp Change-Id: Ied79d02912ffb3a307a99483df7db08c7f9d0cd8 |
||
|---|---|---|
| .. | ||
| access | ||
| bearer | ||
| kernel | ||
| socket | ||
| ssl | ||
| network.pro | ||
Conflicts: mkspecs/win32-clang-msvc/qmake.conf src/gui/image/qpnghandler.cpp Change-Id: Ied79d02912ffb3a307a99483df7db08c7f9d0cd8 |
||
|---|---|---|
| .. | ||
| access | ||
| bearer | ||
| kernel | ||
| socket | ||
| ssl | ||
| network.pro | ||