Commit c6125f27 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/3.5'

Change-Id: I8cc26f38a0ac2453c81108e449b6d84efc9e419c
parents 9e2c0f55 7dbea56b
......@@ -10,7 +10,7 @@
<li><a href="creator-design-mode.html">Designing User Interfaces</a></li>
<li><a href="creator-coding.html">Coding</a></li>
<li><a href="creator-building-running.html">Building and Running</a></li>
<li><a href="creator-testing.html">Debugging and Analyzing</a></li>
<li><a href="creator-testing.html">Testing</a></li>
<li><a href="creator-advanced.html">Advanced Use</a></li>
<li><a href="creator-help-overview.html">Getting Help</a></li>
</ul>
......
......@@ -101,9 +101,9 @@
\list
\li \c {libqwt_designer_plugin.dylib} to
\c {QtCreator.app/Contents/MacOS/designer}
\c {Qt Creator.app/Contents/PlugIns/designer}
\li \c {libqwt.*.dylib} to \c {QtCreator.app/Contents/Frameworks}
\li \c {libqwt.*.dylib} to \c {Qt Creator.app/Contents/Frameworks}
\endlist
......
......@@ -30,7 +30,7 @@ QtcPlugin {
property string llvmLibs: Clang.libraries(qbs.targetOS)
property string llvmVersion: Clang.version(llvmConfig, QtcProcessOutputReader)
condition: llvmConfig
condition: llvmConfig && File.exists(llvmIncludeDir.concat("/clang-c/Index.h"))
cpp.includePaths: base.concat(llvmIncludeDir)
cpp.libraryPaths: base.concat(llvmLibDir)
......
......@@ -3336,7 +3336,7 @@ public:
ExtractFunctionOptions getOptions() const
{
QDialog dlg;
QDialog dlg(Core::ICore::dialogParent());
dlg.setWindowTitle(QCoreApplication::translate("QuickFix::ExtractFunction",
"Extract Function Refactoring"));
auto layout = new QFormLayout(&dlg);
......
......@@ -305,7 +305,7 @@ void CodeAssistantPrivate::proposalComputed()
{
// Since the request runner is a different thread, there's still a gap in which the queued
// signal could be processed after an invalidation of the current request.
if (m_requestRunner != sender())
if (!m_requestRunner || m_requestRunner != sender())
return;
IAssistProposal *newProposal = m_requestRunner->proposal();
......
......@@ -1401,7 +1401,7 @@ void VcsBaseEditorWidget::setCommand(VcsCommand *command)
void VcsBaseEditorWidget::setPlainText(const QString &text)
{
TextEditorWidget::setPlainText(text);
textDocument()->setPlainText(text);
}
// Find the complete file from a diff relative specification.
......
......@@ -87,7 +87,8 @@ unix {
LLVM_VERSION = $$findLLVMVersionFromLibDir($$LLVM_LIBDIR)
}
!exists($$LLVM_INCLUDEPATH): error("Cannot detect include dir for clang, candidate: $$LLVM_INCLUDEPATH")
LIBCLANG_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang-c/Index.h
!exists($$LIBCLANG_MAIN_HEADER): error("Cannot find libclang's main header file, candidate: $$LIBCLANG_MAIN_HEADER")
!exists($$LLVM_LIBDIR): error("Cannot detect lib dir for clang, candidate: $$LLVM_LIBDIR")
clang_lib = $$findClangLibInLibDir($$LLVM_LIBDIR)
isEmpty(clang_lib): error("Cannot find Clang shared library in $$LLVM_LIBDIR")
......
Subproject commit 549274d305d1b756c4316c6510f2bb32c5f937e5
Subproject commit 31881df00d0321f54b8f0d1865d8b16847befde0
import qbs 1.0
import qbs.File
import QtcClangInstallation as Clang
import QtcFunctions
import QtcProcessOutputReader
......@@ -23,7 +24,7 @@ QtcTool {
property string llvmLibDir: Clang.libDir(llvmConfig, QtcProcessOutputReader)
property string llvmLibs: Clang.libraries(qbs.targetOS)
condition: llvmConfig
condition: llvmConfig && File.exists(llvmIncludeDir.concat("/clang-c/Index.h"))
cpp.includePaths: base.concat(["ipcsource", llvmIncludeDir])
cpp.libraryPaths: base.concat(llvmLibDir)
......
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