diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-17 14:57:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-17 14:57:01 (GMT) |
| commit | 807508482b6f5aeb819f1d39d4cb7e63c37d589c (patch) | |
| tree | 47f34ce37bbc60e16d53c4a49ccca8ab818f36d1 /mkspecs | |
| parent | cb3b2199f2703f4c00bfbbc66c5b38a9a32c2b60 (diff) | |
| parent | bbbe40631bac44489d35d7ae76a3ccd41b75fe6a (diff) | |
| download | Qt-807508482b6f5aeb819f1d39d4cb7e63c37d589c.zip Qt-807508482b6f5aeb819f1d39d4cb7e63c37d589c.tar.gz Qt-807508482b6f5aeb819f1d39d4cb7e63c37d589c.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (67 commits)
Add ".make.cache" to the files to be cleaned for symbian-abld.
Fix mismatched $$translations handling after merge
Fix emulator deployment for items with "!:" drive.
Temporarily removed Harmattan specific patches
QTcpSocket: Fix for disconnect in Unbuffered mode.
QMeeGoLivePixmapData : when creating QImage, use constructor with pitch.
Added automatic graphicssystem switching on meego when app is minimized.
Disabled non-QDeclarativeItems in Flickable break flicking
Hot fix for compilation without QGL_USE_TEXTURE_POOL
Initial implementation of GLES2.0 resource pooling
Designer: Fix a bug affecting tab reordering of promoted tab widgets.
Designer: Fix a bug clearing the Z-Order when adding a new widget.
Adjust right bearing when breaking with line separators
Fix the license info for bin/elf2e32_qtwrapper.pl.
Avoid panics in QDesktopWidget on Symbian emulator.
QS60Style: use placeholder texture when polishing widgets and palette
Regression: QS60Style: Theme background is incorrect
Remove changes from fix to QTBUG-17045 that were not related to the fix
Prevent null pointer crash when closing splitview
Border still drawn on Rectangle elements when border.width == 0
...
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 2 | ||||
| -rw-r--r-- | mkspecs/features/symbian/sis_targets.prf | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index e3813a4..d9f6279 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -260,7 +260,7 @@ defineTest(matchSymbianLanguages) { HANDLED_LANGUAGES += $$strippedLanguage SYMBIAN_UNMAPPED_LANGUAGES += $$language SYMBIAN_MATCHED_LANGUAGES += $$language - SYMBIAN_MATCHED_TRANSLATIONS += $$translation + SYMBIAN_MATCHED_TRANSLATIONS += $$_PRO_FILE_PWD_/$$translation SYMBIAN_LANGUAGE_FALLBACK.$$language = $$strippedLanguage export(SYMBIAN_LANGUAGE_FALLBACK.$$language) } diff --git a/mkspecs/features/symbian/sis_targets.prf b/mkspecs/features/symbian/sis_targets.prf index d6d6df0..9963b30 100644 --- a/mkspecs/features/symbian/sis_targets.prf +++ b/mkspecs/features/symbian/sis_targets.prf @@ -142,6 +142,7 @@ equals(GENERATE_SIS_TARGETS, true) { && echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> $$make_cache_name QMAKE_EXTRA_TARGETS += store_build_target + QMAKE_CLEAN += $$make_cache_name } } else { sis_destdir = $$DESTDIR |