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/3rdparty | |
| 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/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 2 |
1 files changed, 1 insertions, 1 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 } } } |