Commit ba3c84e1 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge remote-tracking branch 'origin/2.6' into 2.7

parents 75ef7e84 90fdd983
...@@ -25181,22 +25181,22 @@ Reason: %2</source> ...@@ -25181,22 +25181,22 @@ Reason: %2</source>
<message> <message>
<source>%1 Debug</source> <source>%1 Debug</source>
<extracomment>Debug build configuration. We recommend not translating it.</extracomment> <extracomment>Debug build configuration. We recommend not translating it.</extracomment>
<translation>%1 Отладка</translation> <translation>%1 Debug</translation>
</message> </message>
<message> <message>
<source>%1 Release</source> <source>%1 Release</source>
<extracomment>Release build configuration. We recommend not translating it.</extracomment> <extracomment>Release build configuration. We recommend not translating it.</extracomment>
<translation>%1 Выпуск</translation> <translation>%1 Release</translation>
</message> </message>
<message> <message>
<source>Debug</source> <source>Debug</source>
<extracomment>Name of a debug build configuration to created by a project wizard. We recommend not translating it.</extracomment> <extracomment>Name of a debug build configuration to created by a project wizard. We recommend not translating it.</extracomment>
<translation>Отладка</translation> <translation>Debug</translation>
</message> </message>
<message> <message>
<source>Release</source> <source>Release</source>
<extracomment>Name of a release build configuration to be created by a project wizard. We recommend not translating it.</extracomment> <extracomment>Name of a release build configuration to be created by a project wizard. We recommend not translating it.</extracomment>
<translation>Выпуск</translation> <translation>Release</translation>
</message> </message>
</context> </context>
<context> <context>
...@@ -70,6 +70,7 @@ QMAKE_EXTRA_TARGETS += check-ts ...@@ -70,6 +70,7 @@ QMAKE_EXTRA_TARGETS += check-ts
isEqual(QMAKE_DIR_SEP, /) { isEqual(QMAKE_DIR_SEP, /) {
commit-ts.commands = \ commit-ts.commands = \
cd $$wd; \ cd $$wd; \
git add -N share/qtcreator/translations/*_??.ts && \
for f in `git diff-files --name-only share/qtcreator/translations/*_??.ts`; do \ for f in `git diff-files --name-only share/qtcreator/translations/*_??.ts`; do \
$$LCONVERT -locations none -i \$\$f -o \$\$f; \ $$LCONVERT -locations none -i \$\$f -o \$\$f; \
done; \ done; \
...@@ -77,6 +78,7 @@ isEqual(QMAKE_DIR_SEP, /) { ...@@ -77,6 +78,7 @@ isEqual(QMAKE_DIR_SEP, /) {
} else { } else {
commit-ts.commands = \ commit-ts.commands = \
cd $$wd && \ cd $$wd && \
git add -N share/qtcreator/translations/*_??.ts && \
for /f usebackq %%f in (`git diff-files --name-only share/qtcreator/translations/*_??.ts`) do \ for /f usebackq %%f in (`git diff-files --name-only share/qtcreator/translations/*_??.ts`) do \
$$LCONVERT -locations none -i %%f -o %%f $$escape_expand(\\n\\t) \ $$LCONVERT -locations none -i %%f -o %%f $$escape_expand(\\n\\t) \
cd $$wd && git add share/qtcreator/translations/*_??.ts && git commit cd $$wd && git add share/qtcreator/translations/*_??.ts && git commit
......
...@@ -440,7 +440,8 @@ void ExamplesWelcomePage::openProject(const QString &projectFile, const QStringL ...@@ -440,7 +440,8 @@ void ExamplesWelcomePage::openProject(const QString &projectFile, const QStringL
if (project->needsConfiguration()) if (project->needsConfiguration())
project->configureAsExampleProject(platforms); project->configureAsExampleProject(platforms);
Core::ModeManager::activateModeType(Core::Constants::MODE_EDIT_TYPE); Core::ModeManager::activateModeType(Core::Constants::MODE_EDIT_TYPE);
Core::ICore::helpManager()->handleHelpRequest(help.toString()+QLatin1String("?view=split")); if (help.isValid())
Core::ICore::helpManager()->handleHelpRequest(help.toString() + QLatin1String("?view=split"));
} }
if (!errorMessage.isEmpty()) if (!errorMessage.isEmpty())
QMessageBox::critical(Core::ICore::mainWindow(), tr("Failed to Open Project"), errorMessage); QMessageBox::critical(Core::ICore::mainWindow(), tr("Failed to Open Project"), errorMessage);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment