From 1c90a9631b6f2c16131544466aabd52d272ea3cf Mon Sep 17 00:00:00 2001 From: Sergey Belyashov Date: Wed, 19 Oct 2016 11:16:11 +0300 Subject: [PATCH 1/5] Update Russian translation Change-Id: I1353d68a2a07a031446ebe2b2ae4eb45f07f06e3 Reviewed-by: Denis Shienkov Reviewed-by: Oswald Buddenhagen --- share/qtcreator/translations/qtcreator_ru.ts | 48 ++++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 7b44ddb9e3e..5d63556c128 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -19865,6 +19865,38 @@ Ids must begin with a lowercase letter. iOS tool Error %1 Ошибка %1 утилиты iOS + + Application install on Simulator failed. %1 + Не удалось установить приложение на эмулятор. %1 + + + Application install on Simulator failed. Simulator not running. + Не удалось установить приложение на эмулятор. Он не запущен. + + + Application launch on Simulator failed. Invalid Bundle path %1 + Запуск приложения на эмуляторе не удался. Неверный путь пакета %1 + + + Spawning the Application process on Simulator failed. + Не удалось породить процесс приложения на эмуляторе. + + + Application launch on Simulator failed. Simulator not running. + Не удалось запустить приложение на эмуляторе. Он не запущен. + + + Application launch on Simulator failed. %1 + Запуск приложения на эмуляторе не удался. %1 + + + Spawning the Application process on Simulator failed. Spawning timed out. + Не удалось породить процесс приложения на эмуляторе. Время порождения истекло. + + + Simulator application process error %1 + Приложение из эмулятора вернуло ошибку %1 + IosDeployStepWidget @@ -21336,14 +21368,14 @@ Ids must begin with a lowercase letter. Nim::NimCompilerBuildStepFactory Nim Compiler Build Step - Этап сборки компилятора Nim + Этап сборки компилятора Nim Nim::NimCompilerCleanStep Nim Clean Step - Этап очистки компилятора Nim + Этап очистки компилятора Nim Build directory "%1" does not exist. @@ -21432,28 +21464,28 @@ Ids must begin with a lowercase letter. NimCompilerBuildStep Nim Compiler Build Step - Этап сборки компилятора Nim + Этап сборки компилятора Nim NimCompilerBuildStepConfigWidget Nim build step - Этап сборки Nim + Этап сборки Nim NimCompilerCleanStepFactory Nim Compiler Clean Step - Этап очистки компилятора Nim + Этап очистки компилятора Nim NimCompilerCleanStepWidget Nim clean step - Этап очистки Nim + Этап очистки Nim @@ -36642,11 +36674,11 @@ In addition, Shift+Enter inserts an escape character at the cursor position and Remove the automatically inserted character if the trigger is deleted by backspace after the completion. - Удалять автоматически вставленный символ, если флаг удалён бекспейсом после дополнения. + Удалять автоматически вставленный символ, если флаг удалён бекспейсом после дополнения. Remove automatically inserted text on backspace - Удалять автоматически вставленный текст по бекспейсу + Удалять автоматически вставленный текст по бекспейсу Documentation Comments From c1e600a41dd8454a2a3275e95d6ab2b5a4bf6438 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 2 Sep 2016 15:48:16 +0200 Subject: [PATCH 2/5] Remove the qt keyword from CONFIG This is already implicitly included, however since the placement of it can interfere with the qtquickcompiler, it should be removed. Change-Id: I270fa0093ad8a7739f4f25bbef477560003e2d01 Reviewed-by: Oswald Buddenhagen --- .../qtcreator/templates/wizards/qtquick2-extension/project.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qtcreator/templates/wizards/qtquick2-extension/project.pro b/share/qtcreator/templates/wizards/qtquick2-extension/project.pro index cd8c68954c6..36df40ced98 100644 --- a/share/qtcreator/templates/wizards/qtquick2-extension/project.pro +++ b/share/qtcreator/templates/wizards/qtquick2-extension/project.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = %ProjectName% QT += qml quick -CONFIG += qt plugin c++11 +CONFIG += plugin c++11 TARGET = $$qtLibraryTarget($$TARGET) uri = %Uri% From 4f06d084fcee59911821add6cca54d94f03ab1b3 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 27 Oct 2016 13:38:04 +0200 Subject: [PATCH 3/5] Source packages: Fix that tar.xz was not xz but gz Change-Id: I5379cdfe963f53cca04317ea51f544c40743db7b Reviewed-by: Iikka Eklund --- scripts/createSourcePackages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/createSourcePackages.py b/scripts/createSourcePackages.py index d6e89a85fa3..af99704ac3f 100755 --- a/scripts/createSourcePackages.py +++ b/scripts/createSourcePackages.py @@ -78,7 +78,7 @@ def package_repos(repos, combined_prefix, target_file_base): print('Creating .tar.gz...') createTarGz(archive_path(crlf=False), target_file_base + '.tar.gz') print('Creating .tar.xz...') - createTarGz(archive_path(crlf=False), target_file_base + '.tar.xz') + createTarXz(archive_path(crlf=False), target_file_base + '.tar.xz') print('Creating .zip with CRLF...') createZip(archive_path(crlf=True), target_file_base + '.zip') print('Removing temporary directory...') From 11dd0f4c6f52e18a4e69d3fc2f6627325bde82d8 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 28 Oct 2016 15:16:41 +0200 Subject: [PATCH 4/5] Update qbs submodule To HEAD of 1.6 branch. Change-Id: Ideda150d8126e09fa105b3b85848f7af102a29d4 Reviewed-by: Joerg Bornemann --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index 704eb30d271..738ed8e5c0d 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 704eb30d27117d88e3edbe5d255ea5b8989509f3 +Subproject commit 738ed8e5c0de334d780659bbef8a360154a87221 From 501bf4918fb36798bd8b490c38ba8f6febb7c882 Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Fri, 28 Oct 2016 14:38:20 -0200 Subject: [PATCH 5/5] Fix CDB detection To make sure CDB is really installed on a Windows Kit, we need to assure the 'inc' subdirectory is present. Before this patch, if, for instance, the Windows 8.1 kit is present (including a Debuggers subdirectory), but without CDB, the first test under "32-bit" qmake will yield a false positive, preventing the following 32-bit kits to be tested, then to fail under the 64-bit qmake test because the 'inc' directory is inexistent, finally bringing about an empty CDB_PATH variable. Change-Id: I1d7cf3350f4a63a556ef106faa5b3f0593dcf8c8 Reviewed-by: Andrew Knight Reviewed-by: Brett Stottlemyer Reviewed-by: David Schulz --- src/libs/qtcreatorcdbext/cdb_detect.pri | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/qtcreatorcdbext/cdb_detect.pri b/src/libs/qtcreatorcdbext/cdb_detect.pri index 286d9f20c30..ae09e258d4d 100644 --- a/src/libs/qtcreatorcdbext/cdb_detect.pri +++ b/src/libs/qtcreatorcdbext/cdb_detect.pri @@ -14,9 +14,9 @@ msvc { # Starting from Windows SDK 8, the headers and libs are under 'ProgramFiles (x86)'. # The libraries are under 'ProgramFiles'as well, so, check for existence of 'inc'. # 32bit qmake: - !exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Windows Kits/8.0/Debuggers" - !exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Windows Kits/8.1/Debuggers" - !exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Windows Kits/10/Debuggers" + !exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles)/Windows Kits/8.0/Debuggers" + !exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles)/Windows Kits/8.1/Debuggers" + !exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles)/Windows Kits/10/Debuggers" # 64bit qmake: !exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles) (x86)/Windows Kits/8.0/Debuggers" !exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles) (x86)/Windows Kits/8.1/Debuggers"