diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-15 12:15:25 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-16 13:00:07 (GMT) |
| commit | 515fd562d87290c3fc0eb45817434dd0744d346e (patch) | |
| tree | ff4e54f2d504e8ed88c54f3ccc033fdd17fc59cd /tests/auto/qpointer | |
| parent | 03c60ccac1ab416ebee7a262f1c910774fdc2ff2 (diff) | |
| download | Qt-515fd562d87290c3fc0eb45817434dd0744d346e.zip Qt-515fd562d87290c3fc0eb45817434dd0744d346e.tar.gz Qt-515fd562d87290c3fc0eb45817434dd0744d346e.tar.bz2 | |
Use include(original mkspec) instead of copying of mkspec to default
Having QMAKESPEC_ORIGINAL at the end of the default qmake.conf sets
the mkspec too late for scope checks in symbian-mmp.conf and related
files. Fixed by changing how default mkspec is handled: it is no
longer simply copied over to mkspecs/default by configure but
rather included with include statement in the generated
mkspecs/default/qmake.conf after setting of QMAKESPEC_ORIGINAL value.
This should also fix any issues with relative includes in mkspecs
used as default that are not on same level as mkspecs/default folder.
Task-number: QTBUG-15159
Reviewed-by: Oswald Buddenhagen
Reviewed-by: Joerg Bornemann
Diffstat (limited to 'tests/auto/qpointer')
0 files changed, 0 insertions, 0 deletions