From b4c52505ca7333d9c013264b0496ff533d75ffe8 Mon Sep 17 00:00:00 2001
From: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Date: Tue, 13 Oct 2015 14:21:37 +0300
Subject: [PATCH 1/2] Update Russian translation

Change-Id: I7c863c0ac12d20adcfb3107f050a9c6a3148b6ef
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 share/qtcreator/translations/qtcreator_ru.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 1eab1e6d929..5e1e547639b 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -27466,6 +27466,10 @@ Neither the path to the library nor the path to its includes is added to the .pr
 </context>
 <context>
     <name>QmlDesigner::QmlDesignerPlugin</name>
+    <message>
+        <source>Cannot create OpenGL context.</source>
+        <translation>Не удалось создать контекст OpenGL.</translation>
+    </message>
     <message>
         <source>Switch Text/Design</source>
         <translation>Переключить текст/дизайн</translation>
@@ -29180,6 +29184,10 @@ references to elements in other files, loops, and so on.)</source>
 </context>
 <context>
     <name>QmlProfiler::Internal::QmlProfilerPlugin</name>
+    <message>
+        <source>Cannot create OpenGL context.</source>
+        <translation>Не удалось создать контекст OpenGL.</translation>
+    </message>
     <message>
         <source>QML Profiler</source>
         <translation>Профайлер QML</translation>
@@ -37200,6 +37208,13 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <translation>Ошибка загрузки режима приветствия</translation>
     </message>
 </context>
+<context>
+    <name>Welcome::Internal::WelcomePlugin</name>
+    <message>
+        <source>Cannot create OpenGL context.</source>
+        <translation>Не удалось создать контекст OpenGL.</translation>
+    </message>
+</context>
 <context>
     <name>WidgetPluginManager</name>
     <message>

From e8d0f36faac6067ed8b6b5429f29411a1cb9c70d Mon Sep 17 00:00:00 2001
From: Adam Majer <adamm@zombino.com>
Date: Sun, 27 Sep 2015 18:02:38 -0500
Subject: [PATCH 2/2] Do not embed rpath to external libraries

Some distributions, like Debian, generally do not permit rpath to be
set. Add a configure option that disables rpath inclusion to external
libraries.

Change-Id: Ieb1b16d3a154fdf9da09902dc8a27dd1be0a530e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/clangcodemodel/clangcodemodel.pro | 4 +++-
 src/tools/clangbackend/clangbackend.pro       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/clangcodemodel/clangcodemodel.pro b/src/plugins/clangcodemodel/clangcodemodel.pro
index b4758730d88..38d7f7dd0fd 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.pro
+++ b/src/plugins/clangcodemodel/clangcodemodel.pro
@@ -9,7 +9,9 @@ DEFINES += CLANGCODEMODEL_LIBRARY
 DEFINES += CLANG_VERSION=\\\"$${LLVM_VERSION}\\\"
 DEFINES += "\"CLANG_RESOURCE_DIR=\\\"$${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include\\\"\""
 
-unix:QMAKE_LFLAGS += -Wl,-rpath,\'$$LLVM_LIBDIR\'
+unix {
+    !disable_external_rpath: QMAKE_LFLAGS += -Wl,-rpath,\'$$LLVM_LIBDIR\'
+}
 
 SOURCES += \
     activationsequencecontextprocessor.cpp \
diff --git a/src/tools/clangbackend/clangbackend.pro b/src/tools/clangbackend/clangbackend.pro
index 452eb8dbded..c3210fedbfb 100644
--- a/src/tools/clangbackend/clangbackend.pro
+++ b/src/tools/clangbackend/clangbackend.pro
@@ -16,5 +16,5 @@ SOURCES += clangbackendmain.cpp
 
 unix {
     !osx: QMAKE_LFLAGS += -Wl,-z,origin
-    QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR})
+    !disable_external_rpath: QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR})
 }