Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/global/qglobal.h Change-Id: I2c0f7544bf194f2d0f59218fd583c822901487b0 |
||
|---|---|---|
| .. | ||
| doc | ||
| dom | ||
| sax | ||
| qtxmlglobal.h | ||
| xml.pro | ||
Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/global/qglobal.h Change-Id: I2c0f7544bf194f2d0f59218fd583c822901487b0 |
||
|---|---|---|
| .. | ||
| doc | ||
| dom | ||
| sax | ||
| qtxmlglobal.h | ||
| xml.pro | ||