diff options
| author | axis <qt-info@nokia.com> | 2010-03-08 15:53:35 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-08 15:53:35 (GMT) |
| commit | 1a289e35cffc55b341a7c4894a26c1693a575f98 (patch) | |
| tree | 717cb1a29f985ff6ba1f868fb394bf84f6c1f028 /src/tools/bootstrap | |
| parent | 34898eaa384684c74786cd59fc322054c8888c51 (diff) | |
| download | Qt-1a289e35cffc55b341a7c4894a26c1693a575f98.zip Qt-1a289e35cffc55b341a7c4894a26c1693a575f98.tar.gz Qt-1a289e35cffc55b341a7c4894a26c1693a575f98.tar.bz2 | |
Added Symbian def file support to Linux build system.
This also switches the official def file variable in qmake profiles
to DEF_FILE.
Support for freezing def files was also added, but needs more work
and is therefore disabled for now.
Task: QTBUG-7510
Task: QTBUG-8052
Diffstat (limited to 'src/tools/bootstrap')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 6 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index c5e1e1c..15e746a 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -62,8 +62,12 @@ mac { LIBS += -framework CoreServices } -# Make dummy "sis" target to keep recursive "make sis" working. +# Make dummy "sis" and "freeze" target to keep recursive "make sis/freeze" working. sis_target.target = sis sis_target.commands = sis_target.depends = first QMAKE_EXTRA_TARGETS += sis_target +freeze_target.target = freeze +freeze_target.commands = +freeze_target.depends = first +QMAKE_EXTRA_TARGETS += freeze_target diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index d211f47..48dc444 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -114,8 +114,12 @@ contains(QT_CONFIG, zlib) { lib.CONFIG = dummy_install INSTALLS += lib -# Make dummy "sis" target to keep recursive "make sis" working. +# Make dummy "sis" and "freeze" target to keep recursive "make sis/freeze" working. sis_target.target = sis sis_target.commands = sis_target.depends = first QMAKE_EXTRA_TARGETS += sis_target +freeze_target.target = freeze +freeze_target.commands = +freeze_target.depends = first +QMAKE_EXTRA_TARGETS += freeze_target |