diff options
| author | axis <qt-info@nokia.com> | 2010-03-08 16:22:07 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-08 16:22:07 (GMT) |
| commit | 9a1b9728cc3a65da6646129c8422fa43ea2afed2 (patch) | |
| tree | c7892cceefaf71e45e3e2957f7d3d455954c51ee /src | |
| parent | 86ef6dc634ccf8518188a73262aa95b782352f20 (diff) | |
| parent | 16113ecd5135aea01aac1fa3954143e59269bd50 (diff) | |
| download | Qt-9a1b9728cc3a65da6646129c8422fa43ea2afed2.zip Qt-9a1b9728cc3a65da6646129c8422fa43ea2afed2.tar.gz Qt-9a1b9728cc3a65da6646129c8422fa43ea2afed2.tar.bz2 | |
Merge branch 'defFilesAndMisc'
Conflicts:
mkspecs/common/symbian/symbian-makefile.conf
mkspecs/symbian/features/symbian_building.prf
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 2 | ||||
| -rw-r--r-- | src/qbase.pri | 2 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 6 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 6 |
4 files changed, 12 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 8cd97a9..1870a80 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -3418,7 +3418,7 @@ CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4 symbian { shared { contains(CONFIG, def_files) { - defFilePath=../WebKit/qt/symbian + DEF_FILE=../WebKit/qt/symbian } } } 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 |