.gitignore

@@ -29,6 +29,7 @@
 .DS_Store
 /.qmake.cache
 /.qmake.stash
+/.clang-format
 Makefile*
 Thumbs.db
 core
@@ -51,6 +52,7 @@ wrapper.sh
 /src/app/Info.plist
 /src/plugins/**/*.json
 /src/plugins/coreplugin/ide_version.h
+/src/libs/qt-breakpad/bin
 app_version.h
 phony.c
 

README.md

@@ -242,14 +242,14 @@ http://llvm.org/docs/GettingStarted.html#git-mirror:
 
    1. Clone LLVM and switch to a suitable branch
 
-          git clone http://llvm.org/git/llvm.git
+          git clone https://git.llvm.org/git/llvm.git/
           cd llvm
           git checkout release_39
 
    2. Clone Clang into llvm/tools/clang and switch to a suitable branch
 
           cd tools
-          git clone http://llvm.org/git/clang.git
+          git clone https://git.llvm.org/git/clang.git/
           cd clang
           git checkout release_39
 

dist/changes-4.5.0.md

+Qt Creator version 4.5 contains bug fixes and new features.
+
+The most important changes are listed in this document. For a complete
+list of changes, see the Git log for the Qt Creator sources that
+you can check out from the public Git repository. For example:
+
+    git clone git://code.qt.io/qt-creator/qt-creator.git
+    git log --cherry-pick --pretty=oneline origin/4.4..v4.5.0
+
+General
+
+* Implemented "fuzzy" camel case lookup similar to code completion for locator
+  (QTCREATORBUG-3111)
+* Changed `File System` pane to tree view with top level directory selectable
+  from `Computer`, `Home`, `Projects`, and individual project root directories
+  (QTCREATORBUG-8305)
+
+Editing
+
+* Added shortcut for sorting selected lines
+
+All Projects
+
+* Added progress indicator to project tree while project is parsed
+* Added support for changing the maximum number of lines shown in compile output
+  (QTCREATORBUG-2200)
+
+CMake Projects
+
+* Added groups to CMake configuration UI
+* Added option to change configuration variable types
+* Fixed that value was removed when renaming configuration variable
+  (QTCREATORBUG-17926)
+
+C++ Support
+
+* Fixed lookup of functions that differ only in const-ness of arguments
+  (QTCREATORBUG-18475)
+* Fixed detection of macros defined by tool chain for `C`
+* Fixed that `Refactoring` context menu blocked UI while checking for available
+  actions
+* Clang Code Model
+    * Added sanity check to `Clang Code Model Warnings` option
+      (QTCREATORBUG-18864)
+    * Fixed completion in `std::make_unique` and `std::make_shared` constructors
+      (QTCREATORBUG-18615)
+    * Fixed that function argument completion switched selected overload back to
+      default after typing comma (QTCREATORBUG-11688)
+* GCC
+    * Improved auto-detection to include versioned binaries and cross-compilers
+
+QML Support
+
+* Added wizards with different starting UI layouts
+
+Python Support
+
+* Added simple code folding
+
+Debugging
+
+* Changed pretty printing of `QFlags` and bitfields to hexadecimal
+* Fixed `Run in terminal` for debugging external application
+  (QTCREATORBUG-18912)
+* LLDB / macOS
+    * Added pretty printing of Core Foundation and Foundation string-like types
+      (QTCREATORBUG-18638)
+
+QML Profiler
+
+* Improved robustness when faced with invalid data
+
+Qt Quick Designer
+
+* Added option to only show visible items in navigator
+
+Version Control Systems
+
+* Added query for saving modified files before opening commit editor
+  (QTCREATORBUG-3857)
+
+Beautifier
+
+* Clang Format
+    * Added action `Disable Formatting for Selected Text`
+    * Changed formatting without selection to format the syntactic entity
+      around the cursor
+
+Model Editor
+
+* Added support for custom relations
+
+SCXML Editor
+
+* Fixed crash after warnings are removed
+
+Platform Specific
+
+Windows
+
+* Fixed that environment variable keys were converted to upper case in build
+  and run configurations (QTCREATORBUG-18915)
+
+macOS
+
+* Fixed several issues when using case sensitive file systems while `File system
+  case sensitivity` is set to `Case Insensitive` (QTCREATORBUG-17929,
+  QTCREATORBUG-18672, QTCREATORBUG-18678)
+
+Android
+
+* Removed support for local deployment (QTBUG-62995)
+* Removed support for Ant
+* Improved checks for minimum requirements of Android tools (QTCREATORBUG-18837)
+
+Universal Windows Platform
+
+* Fixed deployment on Windows 10 Phone emulator
+
+Credits for these changes go to:  
+Alessandro Portale  
+Alexander Volkov  
+Andre Hartmann  
+André Pönitz  
+Christian Kandeler  
+Christian Stenger  
+Claus Steuer  
+Daniel Trevitz  
+David Schulz  
+Eike Ziller  
+Friedemann Kleint  
+Ivan Donchevskii  
+Jake Petroules  
+Jaroslaw Kobus  
+Jochen Becher  
+Knud Dollereder  
+Laurent Montel  
+Marco Benelli  
+Marco Bubke  
+Mitch Curtis  
+Nikita Baryshnikov  
+Nikolai Kosjar  
+Oliver Wolff  
+Orgad Shaneh  
+Robert Löhning  
+Ryuji Kakemizu  
+Samuel Gaist  
+Serhii Moroz  
+Thiago Macieira  
+Thomas Hartmann  
+Tim Jenssen  
+Tobias Hunger  
+Ulf Hermann  
+Vikas Pachdha

dist/clangformat/.clang-format

+# .clang-format for Qt Creator
+#
+# This is for clang-format >= 5.0.
+#
+# The configuration below follows the Qt Creator Coding Rules [1] as closely as
+# possible. For documentation of the options, see [2].
+#
+# Use ../../tests/manual/clang-format-for-qtc/test.cpp for documenting problems
+# or testing changes.
+#
+# [1] https://doc-snapshots.qt.io/qtcreator-extending/coding-style.html
+# [2] https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+#
+---
+Language:        Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: DontAlign
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterClass:      true
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   true
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     true
+  AfterUnion:      false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeComma
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: false
+ColumnLimit:    100
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - forever # avoids { wrapped to next line
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeCategories:
+  - Regex:           '^<Q.*'
+    Priority:        200
+IncludeIsMainRegex: '(Test)?$'
+IndentCaseLabels: false
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+# Do not add QT_BEGIN_NAMESPACE/QT_END_NAMESPACE as this will indent lines in between.
+MacroBlockBegin: ""
+MacroBlockEnd:   ""
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 4
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 150
+PenaltyBreakBeforeFirstCallParameter: 300
+PenaltyBreakComment: 500
+PenaltyBreakFirstLessLess: 400
+PenaltyBreakString: 600
+PenaltyExcessCharacter: 50
+PenaltyReturnTypeOnItsOwnLine: 300
+PointerAlignment: Right
+ReflowComments:  false
+SortIncludes:    true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: true
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        4
+UseTab:          Never

dist/clangformat/README.md

+# .clang-format for Qt Creator
+
+Alongside this file you find an EXPERIMENTAL .clang-format configuration file
+for the Qt Creator code base.
+
+The current configuration is useful, but not fully in accordance with the
+coding rules. There is also other undesired formatting. Running clang-format
+blindly will not only improve formatting here and there, but will also
+normalize/worsen code that is already considered ideally formatted. See section
+"Coding rules violated by clang-format" below for more information.
+
+If needed, clang-format can be instructed to not format code ranges. Do not
+overuse this.
+
+    // clang-format off
+        void    unformatted_code  ;
+    // clang-format on
+
+For more information about clang-format, see
+
+      <https://clang.llvm.org/docs/ClangFormat.html>
+
+## Prerequisites
+
+ * clang-format >= 5.0
+
+## Set up Qt Creator for use with clang-format
+
+### Install the configuration file
+
+For a given source file to format, clang-format it will read the configuration
+from .clang-format in the closest parent directory for the file to format.
+
+Hence symlink/copy .clang-format from this directory to e.g. Qt Creator's top
+level directory:
+
+For Linux/macOS:
+
+    $ cd $QTC_SOURCE
+    $ ln -s dist/clangformat/.clang-format
+
+For Windows:
+
+    $ cd $QTC_SOURCE
+    $ copy dist\clangformat\.clang-format # Do not forget to keep this updated
+
+### Configure Qt Creator
+
+  1. Enable the Beautifier plugin and restart to load it.
+
+  2. Configure the plugin:
+     In Menu: Tools > Options > Beautifier > Tab: Clang Format
+      * Select a valid clang-format executable
+      * Use predefined style: File
+          * Fallback style: None
+
+  3. Set shortcuts for convenience:
+     In Menu: Tools > Options > Environment > Keyboard
+      * ClangFormat / FormatFile - e.g. Alt+C, F
+      * ClangFormat / FormatAtCursor - e.g. Alt+C, C
+      * ClangFormat / DisableFormattingSelectedText - e.g. Alt+C, D
+
+Due to several issues outlined below the FormatFile action might be of limited
+use.
+
+## Coding rules enforced by clang-format
+
+This is a copy-pasted list of coding rules from
+<https://doc-snapshots.qt.io/qtcreator-extending/coding-style.html> that can be
+enforced with the current configuration:
+
+* Formatting
+  * Whitespace
+    * Use four spaces for indentation, no tabs.
+    * Always use only one blank line (to group statements together)
+    * Pointers and References: For pointers or references, always use a single
+      space before an asterisk (*) or an ampersand (&), but never after.
+    * Operator Names and Parentheses: Do not use spaces between operator names
+      and parentheses.
+    * Function Names and Parentheses: Do not use spaces between function names
+      and parentheses.
+    * Keywords: Always use a single space after a keyword, and before a curly
+      brace.
+  * Braces
+    * As a base rule, place the left curly brace on the same line as the start
+      of the statement.
+    * Exception: Function implementations and class declarations always have
+      the left brace in the beginning of a line
+  * Line Breaks
+    * Keep lines shorter than 100 characters
+    * Insert line breaks if necessary.
+    * Commas go at the end of a broken line.
+    * Operators start at the beginning of the new line.
+  * Namespaces:
+    * Put the left curly brace on the same line as the namespace keyword.
+    * Do not indent declarations or definitions inside.
+    * Optional, but recommended if the namespaces spans more than a few lines:
+      Add a comment after the right curly brace repeating the namespace.
+* Patterns and Practices
+  * C++11 and C++14 Features / Lambdas:
+    * Optionally, place the lambda completely on one line if it fits.
+    * Place a closing parenthesis and semicolon of an enclosing function call
+      on the same line as the closing brace of the lambda.
+
+## Coding rules violated by clang-format
+
+* Formatting / Namespaces
+  * As an exception, if there is only a single class declaration inside the
+    namespace, all can go on a single line.  Currently this ends up on several
+    lines, which is noisy.
+* Patterns and Practices / C++11 and C++14 Features / Lambdas
+  * If you are using a lambda in an 'if' statement, start the lambda on a new
+    line.
+
+### Other undesired formattings
+
+For a more complete list of observations and problems, see the "// NOTE: "
+comments in ../../tests/manual/clang-format-for-qtc/test.cpp.
+
+#### Manually aligned complex expressions in e.g. if-conditions are collapsed
+
+We want:
+
+    if (someFancyAndLongerExpression1
+            || someFancyAndLongerExpression2
+            || someFancyAndLongerExpression3) {
+        return value;
+    }
+
+Current:
+
+    if (someFancyAndLongerExpression1 || someFancyAndLongerExpression2
+        || someFancyAndLongerExpression3) {
+        return value;
+    }
+
+#### connect() calls do not follow the standard two-line pattern
+
+In general, for middle-sized and longer connect() calls we want to follow this
+two-line pattern.
+
+    connect(sender, &SomeFancySender::signal,
+            receiver, &SomeFancyReceiver::slot);
+
+Current:
+
+    connect(sender,
+            &SomeFancySender::signal,
+            receiver,
+            &SomeFancySender::slot);
+
+#### QTC_ASSERT and excess space after return keyword
+
+For QTC_ASSERT in combination with the return keyword, an excess space is added:
+
+    QTC_ASSERT(headItem, return );
+

doc/src/android/androiddev.qdoc

@@ -59,12 +59,11 @@
 
         \li \l{http://www.gradle.org}{Gradle} for building application packages
             for Android devices (APK). Gradle is delivered with Qt 5.9, and
-            later.
+            later. Because Gradle scripts are not delivered with Android SDK
+            Tools since version 26.0.0, they are delivered with Qt 5.9 and
+            5.6.3.
 
-            \note Using Ant to build APKs is still possible when developing with
-            Qt 5.8 or earlier together with Android SDK tools versions 25.2.5 or
-            earlier, but Ant support has been deprecated since \QC 4.3 and will
-            be removed in a future version.
+            \note Using Ant to build APKs is no longer supported.
 
         \li A tool chain for building applications for Android devices provided
             by the \l{http://developer.android.com/tools/sdk/ndk/index.html}
@@ -151,21 +150,6 @@
             check box to allow \QC to create the kits for you. \QC displays a
             warning if it cannot find a suitable Qt version.
 
-        \li Select the tool to use for building application packages:
-
-            \list
-
-                \li To use Gradle, select the \uicontrol {Use Gradle instead of Ant}
-                    check box.
-
-                \li To use Ant, add the path to the Ant executable in the
-                    \uicontrol {Ant executable} field.