diff options
author | Eike Ziller <eike.ziller@qt.io> | 2016-11-01 08:43:28 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2016-11-01 08:44:04 +0100 |
commit | 2d6f33a92b0d3ae3a94e639a0c634c6d4af7013b (patch) | |
tree | a58ce53e66e5178c84efd819de98c6fee61d4c95 | |
parent | 49c6710b42d49a29b13ea978af710adb73ba3e8d (diff) | |
parent | 501bf4918fb36798bd8b490c38ba8f6febb7c882 (diff) |
Merge remote-tracking branch 'origin/4.1' into 4.2
Change-Id: Ic536dc74b969dce910ec6b91e5a308e97348b8bf
-rwxr-xr-x | scripts/createSourcePackages.py | 2 | ||||
-rw-r--r-- | share/qtcreator/templates/wizards/qtquick2-extension/project.pro | 2 | ||||
-rw-r--r-- | share/qtcreator/translations/qtcreator_ru.ts | 48 | ||||
-rw-r--r-- | src/libs/qtcreatorcdbext/cdb_detect.pri | 6 |
4 files changed, 45 insertions, 13 deletions
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...') 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% 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.</source> <source>iOS tool Error %1</source> <translation>Ошибка %1 утилиты iOS</translation> </message> + <message> + <source>Application install on Simulator failed. %1</source> + <translation>Не удалось установить приложение на эмулятор. %1</translation> + </message> + <message> + <source>Application install on Simulator failed. Simulator not running.</source> + <translation>Не удалось установить приложение на эмулятор. Он не запущен.</translation> + </message> + <message> + <source>Application launch on Simulator failed. Invalid Bundle path %1</source> + <translation>Запуск приложения на эмуляторе не удался. Неверный путь пакета %1</translation> + </message> + <message> + <source>Spawning the Application process on Simulator failed.</source> + <translation>Не удалось породить процесс приложения на эмуляторе.</translation> + </message> + <message> + <source>Application launch on Simulator failed. Simulator not running.</source> + <translation>Не удалось запустить приложение на эмуляторе. Он не запущен.</translation> + </message> + <message> + <source>Application launch on Simulator failed. %1</source> + <translation>Запуск приложения на эмуляторе не удался. %1</translation> + </message> + <message> + <source>Spawning the Application process on Simulator failed. Spawning timed out.</source> + <translation>Не удалось породить процесс приложения на эмуляторе. Время порождения истекло.</translation> + </message> + <message> + <source>Simulator application process error %1</source> + <translation>Приложение из эмулятора вернуло ошибку %1</translation> + </message> </context> <context> <name>IosDeployStepWidget</name> @@ -21336,14 +21368,14 @@ Ids must begin with a lowercase letter.</source> <name>Nim::NimCompilerBuildStepFactory</name> <message> <source>Nim Compiler Build Step</source> - <translation type="unfinished">Этап сборки компилятора Nim</translation> + <translation>Этап сборки компилятора Nim</translation> </message> </context> <context> <name>Nim::NimCompilerCleanStep</name> <message> <source>Nim Clean Step</source> - <translation type="unfinished">Этап очистки компилятора Nim</translation> + <translation>Этап очистки компилятора Nim</translation> </message> <message> <source>Build directory "%1" does not exist.</source> @@ -21432,28 +21464,28 @@ Ids must begin with a lowercase letter.</source> <name>NimCompilerBuildStep</name> <message> <source>Nim Compiler Build Step</source> - <translation type="unfinished">Этап сборки компилятора Nim</translation> + <translation>Этап сборки компилятора Nim</translation> </message> </context> <context> <name>NimCompilerBuildStepConfigWidget</name> <message> <source>Nim build step</source> - <translation type="unfinished">Этап сборки Nim</translation> + <translation>Этап сборки Nim</translation> </message> </context> <context> <name>NimCompilerCleanStepFactory</name> <message> <source>Nim Compiler Clean Step</source> - <translation type="unfinished">Этап очистки компилятора Nim</translation> + <translation>Этап очистки компилятора Nim</translation> </message> </context> <context> <name>NimCompilerCleanStepWidget</name> <message> <source>Nim clean step</source> - <translation type="unfinished">Этап очистки Nim</translation> + <translation>Этап очистки Nim</translation> </message> </context> <context> @@ -36642,11 +36674,11 @@ In addition, Shift+Enter inserts an escape character at the cursor position and </message> <message> <source>Remove the automatically inserted character if the trigger is deleted by backspace after the completion.</source> - <translation type="unfinished">Удалять автоматически вставленный символ, если флаг удалён бекспейсом после дополнения.</translation> + <translation>Удалять автоматически вставленный символ, если флаг удалён бекспейсом после дополнения.</translation> </message> <message> <source>Remove automatically inserted text on backspace</source> - <translation type="unfinished">Удалять автоматически вставленный текст по бекспейсу</translation> + <translation>Удалять автоматически вставленный текст по бекспейсу</translation> </message> <message> <source>Documentation Comments</source> 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" |