diff options
| author | axis <qt-info@nokia.com> | 2010-03-22 09:24:51 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-22 09:24:51 (GMT) |
| commit | e48850c6ec90cd5eaa95d07573c2afa1a1c4f67f (patch) | |
| tree | c53fa338b532c986b4baa1b481e5406f2fa16b5a /src/plugins/s60/3_2 | |
| parent | 390d7f64d9afa288fb2c01fc70eddc8b1f5ff585 (diff) | |
| parent | 7491a2ecfdd0fe883c72d2ee60ca72393c2990d9 (diff) | |
| download | Qt-e48850c6ec90cd5eaa95d07573c2afa1a1c4f67f.zip Qt-e48850c6ec90cd5eaa95d07573c2afa1a1c4f67f.tar.gz Qt-e48850c6ec90cd5eaa95d07573c2afa1a1c4f67f.tar.bz2 | |
Merge branch '4.6-s60' into 4.7-s60
Conflicts:
configure.exe
mkspecs/common/symbian/symbian.conf
src/gui/graphicsview/qgraphicswidget.h
src/gui/kernel/qapplication.cpp
src/gui/text/qtextlayout.cpp
src/openvg/qpixmapdata_vg.cpp
src/s60installs/s60installs.pro
tools/runonphone/main.cpp
tools/runonphone/serenum_unix.cpp
qtextlayout.cpp fixed up together with Eskil.
Kept the configure.exe from 4.7 without recompile.
Diffstat (limited to 'src/plugins/s60/3_2')
| -rw-r--r-- | src/plugins/s60/3_2/3_2.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/s60/3_2/3_2.pro b/src/plugins/s60/3_2/3_2.pro index 7700677..0524866 100644 --- a/src/plugins/s60/3_2/3_2.pro +++ b/src/plugins/s60/3_2/3_2.pro @@ -1,6 +1,6 @@ include(../s60pluginbase.pri) -TARGET = qts60plugin_3_2 +TARGET = qts60plugin_3_2$${QT_LIBINFIX} contains(S60_VERSION, 3.1) { SOURCES += ../src/qlocale_3_1.cpp \ |