Conflicts: dist/changes-5.0.0 mkspecs/features/qt_module_config.prf qmake/project.cpp qmake/property.cpp Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296 |
||
|---|---|---|
| .. | ||
| q_func_info | ||
| qflags | ||
| qgetputenv | ||
| qglobal | ||
| qlogging | ||
| qnumeric | ||
| qrand | ||
| global.pro | ||
Conflicts: dist/changes-5.0.0 mkspecs/features/qt_module_config.prf qmake/project.cpp qmake/property.cpp Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296 |
||
|---|---|---|
| .. | ||
| q_func_info | ||
| qflags | ||
| qgetputenv | ||
| qglobal | ||
| qlogging | ||
| qnumeric | ||
| qrand | ||
| global.pro | ||