summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-03-08 15:53:35 (GMT)
committeraxis <qt-info@nokia.com>2010-03-08 15:53:35 (GMT)
commit1a289e35cffc55b341a7c4894a26c1693a575f98 (patch)
tree717cb1a29f985ff6ba1f868fb394bf84f6c1f028 /src
parent34898eaa384684c74786cd59fc322054c8888c51 (diff)
downloadQt-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')
-rw-r--r--src/qbase.pri2
-rw-r--r--src/tools/bootstrap/bootstrap.pri6
-rw-r--r--src/tools/bootstrap/bootstrap.pro6
3 files changed, 11 insertions, 3 deletions
diff --git a/src/qbase.pri b/src/qbase.pri
index 835ed0e..4a75565 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -104,7 +104,7 @@ symbian {
# built in this exact environment. *Never* use this when building a version
# for release.
contains(CONFIG, def_files) {
- defFilePath=../s60installs
+ DEF_FILE=../s60installs
}
}
load(armcc_warnings)
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