diff options
| author | axis <qt-info@nokia.com> | 2009-12-18 10:32:06 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-12-18 10:32:06 (GMT) |
| commit | 2fb8ea9aa787d59ac16250eade0adfea08f1ca9d (patch) | |
| tree | c274575bb148c9755a901094fc94d4553a84653c /src/gui/painting/painting.pri | |
| parent | ab8508380d6e5875ed871196eb09642380ac1aef (diff) | |
| parent | bf819a04b0c60c64912f72b613c1546d8be7dc50 (diff) | |
| download | Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.zip Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.tar.gz Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
configure
src/gui/text/qfontdatabase_s60.cpp
Diffstat (limited to 'src/gui/painting/painting.pri')
| -rw-r--r-- | src/gui/painting/painting.pri | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index c35c33a..628a109 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -370,7 +370,6 @@ symbian { SOURCES += painting/qwindowsurface_s60.cpp armccIfdefBlock = \ "$${LITERAL_HASH}if defined(ARMV6)" \ - "MACRO QT_HAVE_ARMV6" \ "SOURCEPATH painting" \ "SOURCE qblendfunctions_armv6_rvct.s" \ "SOURCE qdrawhelper_armv6_rvct.s" \ |