diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-10-28 08:18:14 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-10-28 08:18:14 (GMT) |
| commit | bd62bdea9defbd289200ce4d84f0016fc88bd61a (patch) | |
| tree | f26562b824ad55d0e4fabce21135dc97050012ee | |
| parent | cabbff076f40eeeb56beb53220a40f124a2e0215 (diff) | |
| parent | 1631a4b79f0f2d2b8b8075cd6ebbebe3bafbdb2b (diff) | |
| download | Qt-bd62bdea9defbd289200ce4d84f0016fc88bd61a.zip Qt-bd62bdea9defbd289200ce4d84f0016fc88bd61a.tar.gz Qt-bd62bdea9defbd289200ce4d84f0016fc88bd61a.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
| -rw-r--r-- | src/s60installs/s60installs.pro | 4 | ||||
| -rw-r--r-- | src/xmlpatterns/xmlpatterns.pro | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index f553598..d8f164f 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -97,6 +97,10 @@ symbian: { qtlibraries.sources += QtScript.dll } + contains(QT_CONFIG, xmlpatterns): { + qtlibraries.sources += QtXmlPatterns.dll + } + contains(QT_CONFIG, webkit): { qtlibraries.sources += QtWebKit.dll } diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro index bb8e452..1df497d 100644 --- a/src/xmlpatterns/xmlpatterns.pro +++ b/src/xmlpatterns/xmlpatterns.pro @@ -34,3 +34,5 @@ wince*: { QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/ } } + +symbian:TARGET.UID3=0x2001E62B |