Commit 89555084 authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/3.5' into 3.6

 Conflicts:
	src/plugins/clangcodemodel/clangcodemodel.pro

Change-Id: I742f4a0d0aebae029ac361fc4f55d222ff2d65b2
parents 6ff12968 e8d0f36f
......@@ -28819,6 +28819,10 @@ This is independent of the visibility property in QML.</source>
</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>
......@@ -30591,6 +30595,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>
......@@ -38677,6 +38685,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>
......@@ -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})
}
Markdown is supported
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