diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2014-11-18 12:16:17 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2014-11-18 12:16:17 +0100 |
| commit | 4fb5d0f0390b1ddc150fe28b191fc3dbbb0ad77c (patch) | |
| tree | 4ed0fd2aa8f31501ea466e659f623453bd9d1b02 /src/sdk/sdk.pro | |
| parent | 778af9e97d5652c84e027b3e3ccad62122fc92b6 (diff) | |
| parent | 3fb00b56b473bd8c71b5b8a19db4d61fa2279763 (diff) | |
Merge remote-tracking branch 'origin/1.6'
Conflicts:
src/libs/installer/packagemanagercore.cpp
src/sdk/installerbase.cpp
tests/auto/installer/packagemanagercore/tst_packagemanagercore.cpp
Change-Id: I807686f154249930d31de80289389f4655c27525
Diffstat (limited to 'src/sdk/sdk.pro')
| -rw-r--r-- | src/sdk/sdk.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro index c13576518..1227ed1c8 100644 --- a/src/sdk/sdk.pro +++ b/src/sdk/sdk.pro @@ -15,8 +15,8 @@ QT += network qml xml widgets DESTDIR = $$IFW_APP_PATH exists($$LRELEASE) { - QT_LANGUAGES = qt_de qt_ru qt_zh_CN qt_ja - IB_LANGUAGES = de_de en_us ru_ru zh_cn ja_jp + QT_LANGUAGES = qt_de qt_fr qt_ja qt_ru qt_zh_CN + IB_LANGUAGES = de_de en_us fr_fr ja_jp ru_ru zh_cn defineReplace(prependAll) { for(a,$$1):result += $$2$${a}$$3 return($$result) |