diff options
-rw-r--r-- | README.md | 19 | ||||
-rw-r--r-- | src/libs/sqlite/sqlite.qbs | 3 | ||||
-rw-r--r-- | src/plugins/texteditor/texteditoroverlay.cpp | 15 | ||||
-rw-r--r-- | src/shared/clang/clang_installation.pri | 3 | ||||
-rw-r--r-- | tests/system/suite_tools/tst_git_first_commit/test.py | 2 |
5 files changed, 24 insertions, 18 deletions
@@ -116,7 +116,11 @@ For detailed information on the supported compilers, see command...` error. If a `sh.exe` is found, the compile process will fail. You have to remove it from the path. - 10. You are now ready to configure and build Qt and Qt Creator. + 10. To enable the Clang-based code model: Install Clang (>= version 3.6.2) + and set the environment variable LLVM_INSTALL_DIR to point to the + installation location. + + 11. You are now ready to configure and build Qt and Qt Creator. Please see <https://wiki.qt.io/Building_Qt_5_from_Git> for recommended configure-options for Qt 5. To use MinGW, open the the shell prompt and enter: @@ -133,10 +137,17 @@ For detailed information on the supported compilers, see cd ..\creator qmake && jom - 11. To launch Qt Creator, enter: + 12. To launch Qt Creator, enter: qtcreator - 12. When using Visual C++ with the "Debugging Tools for Windows" installed, + 13. To test the Clang-based code model, verify that backend process + bin\clangbackend.exe + launches (displaying its usage). + + The library libclang.dll needs to be copied to the bin directory if + Clang cannot be found in the path. + + 14. When using Visual C++ with the "Debugging Tools for Windows" installed, the extension library `qtcreatorcdbext.dll` to be loaded into the Windows console debugger (`cdb.exe`) should have been built under `lib\qtcreatorcdbext32` or `lib\qtcreatorcdbext64`. @@ -151,7 +162,7 @@ For detailed information on the supported compilers, see debugging from the repository <https://code.qt.io/cgit/qt-creator/binary-artifacts.git/tree> . - 13. Qt Creator can be registered as a post-mortem debugger. This + 15. Qt Creator can be registered as a post-mortem debugger. This can be done in the options page or by running the tool qtcdebugger with administrative privileges passing the command line options -register/unregister, respectively. Alternatively, diff --git a/src/libs/sqlite/sqlite.qbs b/src/libs/sqlite/sqlite.qbs index 2aa3e5f4c9..e974e38cd6 100644 --- a/src/libs/sqlite/sqlite.qbs +++ b/src/libs/sqlite/sqlite.qbs @@ -13,7 +13,8 @@ QtcLibrary { "SQLITE_ENABLE_COLUMN_METADATA" ]) cpp.optimization: "fast" - cpp.dynamicLibraries: base.concat((qbs.targetOS.contains("unix") && !qbs.targetOS.contains("openbsd")) ? ["dl"] : []) + cpp.dynamicLibraries: base.concat((qbs.targetOS.contains("unix") && !qbs.targetOS.contains("openbsd")) + ? ["dl", "pthread"] : []) Group { diff --git a/src/plugins/texteditor/texteditoroverlay.cpp b/src/plugins/texteditor/texteditoroverlay.cpp index f97dc94e79..0e1b8862c2 100644 --- a/src/plugins/texteditor/texteditoroverlay.cpp +++ b/src/plugins/texteditor/texteditoroverlay.cpp @@ -32,10 +32,6 @@ #include <QPainter> #include <QTextBlock> -#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) -#include <private/qtextcursor_p.h> -#endif - using namespace TextEditor; using namespace TextEditor::Internal; @@ -91,13 +87,10 @@ void TextEditorOverlay::addOverlaySelection(int begin, int end, selection.m_fg = fg; selection.m_bg = bg; -#if QT_VERSION >= QT_VERSION_CHECK(5,6,0) - selection.m_cursor_begin = QTextCursorPrivate::fromPosition(document->docHandle(), begin); - selection.m_cursor_end = QTextCursorPrivate::fromPosition(document->docHandle(), end); -#else - selection.m_cursor_begin = QTextCursor(document->docHandle(), begin); - selection.m_cursor_end = QTextCursor(document->docHandle(), end); -#endif + selection.m_cursor_begin = QTextCursor(document); + selection.m_cursor_begin.setPosition(begin); + selection.m_cursor_end = QTextCursor(document); + selection.m_cursor_end.setPosition(end); if (overlaySelectionFlags & ExpandBegin) selection.m_cursor_begin.setKeepPositionOnInsert(true); diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index c5b8739ef3..37f16a8002 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -99,7 +99,8 @@ unix { clang_lib = $$findClangLibInLibDir($$LLVM_LIBDIR) isEmpty(clang_lib): error("Cannot find Clang shared library in $$LLVM_LIBDIR") - LLVM_LIBS = -L$${LLVM_LIBDIR} -l$${clang_lib} + !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LLVM_LIBS = -L$${LLVM_LIBDIR} + LLVM_LIBS += -l$${clang_lib} } isEmpty(LLVM_VERSION): error("Cannot determine clang version at $$LLVM_INSTALL_DIR") diff --git a/tests/system/suite_tools/tst_git_first_commit/test.py b/tests/system/suite_tools/tst_git_first_commit/test.py index 9fc87570dc..1a55a160aa 100644 --- a/tests/system/suite_tools/tst_git_first_commit/test.py +++ b/tests/system/suite_tools/tst_git_first_commit/test.py @@ -59,7 +59,7 @@ def main(): clickButton(waitForObject(":Select a Git Commit.Show_QPushButton")) changedEdit = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidget") waitFor("len(str(changedEdit.plainText)) > 0 and " - "str(changedEdit.plainText) != 'Waiting for data...'", 20000) + "str(changedEdit.plainText) != 'Waiting for data...'", 40000) diffPlainText = str(changedEdit.plainText) test.verify("# This file is used to ignore files which are generated" in diffPlainText, "Comment from .gitignore in diff?") |