Merge remote-tracking branch 'origin/6.0'

Change-Id: Ib49e73e6c69d71fd0d8402c08f4344476295e409

README.md

@@ -307,8 +307,8 @@ we thank the authors who made this possible:
 
   Copyright (C) 2003-2019 LLVM Team
 
-  Distributed under the University of Illinois/NCSA Open Source License (NCSA),
+  Distributed under the Apache 2.0 License with LLVM exceptions,
-  see https://github.com/llvm/llvm-project/blob/master/llvm/LICENSE.TXT
+  see https://github.com/llvm/llvm-project/blob/main/clang/LICENSE.TXT
 
   With backported/additional patches from https://code.qt.io/clang/llvm-project.git
 

cmake/QtCreatorAPI.cmake

@@ -203,6 +203,11 @@ function(add_qtc_library name)
     set(TEST_DEFINES WITH_TESTS SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
   endif()
 
+  if(_arg_STATIC AND UNIX)
+    # not added by Qt if reduce_relocations is turned off for it
+    set_target_properties(${name} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+  endif()
+
   extend_qtc_target(${name}
     INCLUDES ${_arg_INCLUDES}
     PUBLIC_INCLUDES ${_arg_PUBLIC_INCLUDES}

doc/qtcreator/src/editors/creator-code-refactoring.qdoc

@@ -157,14 +157,18 @@
     the symbol. All instances of the local symbol are changed as you type.
     \endif
 
-    \section1 Column Editing
+    \section1 Multi-Cursor Editing
 
-    To apply a change to several rows in a column simultaneously, hold
+    To apply a change to several places simultaneously, press and hold \key Alt,
-    \key Alt, select the rows using the mouse, and enter or remove text.
+    and click to place cursors in several places. Any changes you make are
-    The changes are made simultaneously at the cursor position on all the
+    applied simultaneously at all the cursor positions.
-    selected rows.
 
-    On Windows and Linux, you can also hold \key {Alt+Shift} and select
+    Use the arrow keys to move all the cursors up and down. The \key Home and
-    the rows using the arrow keys and the \key PageUp, \key PageDown,
+    \key End key move all the cursors to the beginning or to the end of the
-    \key Home, \key End keys.
+    line.
+
+    Press and hold \key Alt and double-click strings to select several strings
+    simultaneously.
+
+    Press \key Esc to remove all the cursors and selections.
    */

doc/qtcreator/src/overview/creator-acknowledgements.qdoc

@@ -372,16 +372,12 @@
 
         \li \b{LLVM/Clang}
 
-            \list
+            \l{https://github.com/llvm/llvm-project/}
-            \li \l{https://llvm.org/svn/llvm-project/llvm}
-            \li \l{https://llvm.org/svn/llvm-project/cfe/trunk}
-            \li \l{https://llvm.org/svn/llvm-project/clang-tools-extra/trunk}
-            \endlist
 
             Copyright (C) 2003-2019 LLVM Team
 
-            Distributed under the \l {https://github.com/llvm-mirror/llvm/blob/master/LICENSE.TXT}
+            Distributed under the \l {https://github.com/llvm/llvm-project/blob/main/llvm/LICENSE.TXT}
-            {University of Illinois/NCSA Open Source License (NCSA)}.
+            {Apache 2.0 License with LLVM exceptions}.
 
             With backported/additional patches from
             \list

doc/qtdesignstudio/examples/doc/loginui1.qdoc

@@ -145,9 +145,9 @@
     You can download the logo and the background image from here:
 
     \list
-        \li \l{https://doc.qt.io/qtdesignstudio/images/used-in-examples/loginui1/qt_logo_green_128x128px.png}
+        \li \l{https://doc.qt.io/qtdesignstudio/images/used-in-examples/loginui1/images/qt_logo_green_128x128px.png}
             {qt_logo_green_128x128px.png}
-        \li \l{https://doc.qt.io/qtdesignstudio/images/used-in-examples/loginui1/adventurePage.jpg}
+        \li \l{https://doc.qt.io/qtdesignstudio/images/used-in-examples/loginui1/images/adventurePage.jpg}
             {Background image} (\e adventurePage.jpg)
 
             Photo by \l{https://unsplash.com/photos/a2MgJdG6UvE}