diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-15 11:05:43 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-10-15 11:11:31 +0200 |
| commit | 3ef69b12f6d6905594ef3976b3e16787378dfe6a (patch) | |
| tree | 1105fb45cddf0afca5929041e679e743e36a1772 /src/s60installs/s60installs.pro | |
| parent | 1745a0e7799774373ad6252a73d6e8af841db2a1 (diff) | |
| parent | 9358d77fc1de64d2a8a06bfa4095dcde9f9b009b (diff) | |
| download | qt4-tools-3ef69b12f6d6905594ef3976b3e16787378dfe6a.tar.gz | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
src/gui/painting/qpaintengine_raster.cpp
tests/auto/declarative/qdeclarativetext/data/alignments_cb.png
tests/auto/declarative/qdeclarativetext/data/alignments_cc.png
tests/auto/declarative/qdeclarativetext/data/alignments_ct.png
Diffstat (limited to 'src/s60installs/s60installs.pro')
| -rw-r--r-- | src/s60installs/s60installs.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index bc9d98ba5c..2e6d2febc4 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -200,5 +200,4 @@ symbian: { } BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)" - BLD_INF_RULES.prj_exports += "qtdemoapps.iby $$CUSTOMER_VARIANT_APP_LAYER_IBY_EXPORT_PATH(qtdemoapps.iby)" } |