diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-10-29 12:43:43 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-01 20:17:57 +0100 |
| commit | 7d20f3dd1065a20b40cb4689783fba05190fe317 (patch) | |
| tree | a8e149e2a704fe3fabb9cfff199adbcf234e9cae /qtbase.pro | |
| parent | 8abfe4bb43616d1a57087bfa2c2cfc889a5dcea4 (diff) | |
rewrite default spec handling
instead of symlinking (on unix) or creating a forwarding spec (on
windows), just put the default specs into (the bootstrapped)
QLibraryInfo.
Change-Id: I595500ef7399f77cb8ec117c4303bc0a2ffe505f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'qtbase.pro')
| -rw-r--r-- | qtbase.pro | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/qtbase.pro b/qtbase.pro index 59814d707e..e66d9fbb28 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -87,16 +87,6 @@ mkspecs.files = \ $$OUT_PWD/mkspecs/qconfig.pri $$OUT_PWD/mkspecs/qmodule.pri $$OUT_PWD/mkspecs/qdevice.pri \ $$files($$PWD/mkspecs/*) # $$OUT_PWD contains only symlinks under Unix mkspecs.files -= $$PWD/mkspecs/modules -!equals(OUT_PWD, $$PWD) { - # When shadow building, the default mkspecs only exist in the build tree. - mkspecs.files += $$OUT_PWD/mkspecs/default-host $$OUT_PWD/mkspecs/default -} -!equals(QMAKE_HOST.os, Linux):!equals(QMAKE_HOST.os, Windows) { - # MacOS' (and maybe other Unixes') cp command is too daft to honor -f when copying symlinks. - mkspecs_pre.commands = rm -f $$[QT_HOST_DATA]/mkspecs/default-host $$[QT_HOST_DATA]/mkspecs/default - QMAKE_EXTRA_TARGETS += mkspecs_pre - mkspecs.depends += mkspecs_pre -} INSTALLS += mkspecs global_docs.files = $$PWD/doc/global |