diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2011-03-16 18:37:46 +1000 |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2011-03-16 18:37:46 +1000 |
| commit | 03ca7f1b1b5a46a86e0b351b547283dc842ffd71 (patch) | |
| tree | 9e955de7a5dfc3e805b1bb5b418fdb7d4f5e3a3e /qtmobility.pro | |
| parent | 5577578fea8a983d852b471033f2ad6d9c5ca6c5 (diff) | |
| parent | bc1113315225ab301f3a4b696f013af95fdb66f6 (diff) | |
Merge remote branch 'origin/master' into connectivity/master
Conflicts:
configure
qtmobility.pro
Diffstat (limited to 'qtmobility.pro')
| -rw-r--r-- | qtmobility.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qtmobility.pro b/qtmobility.pro index 74a06dbe9c..28a2e14a5f 100644 --- a/qtmobility.pro +++ b/qtmobility.pro @@ -57,6 +57,8 @@ contains(QT_MAJOR_VERSION, 4):lessThan(QT_MINOR_VERSION, 6) { } } + # Remember to update staticconfig.pri binary version statement + # and pregenerated files under src/s60installs for Symbian RnD release PRF_CONFIG=$${QT_MOBILITY_BUILD_TREE}/features/mobilityconfig.prf system(echo MOBILITY_CONFIG=$${mobility_modules} > $$PRF_CONFIG) system(echo MOBILITY_VERSION = 1.2.0 >> $$PRF_CONFIG) |