Merge remote-tracking branch 'origin/4.1'

Change-Id: Ie96fa53a88bcd06fa688a579c1d84aaf6f5e905f

doc/config/qtcreator-project.qdocconf

@@ -38,10 +38,12 @@ indexes +=    $QDOC_INDEX_DIR/qtwidgets/qtwidgets.index \
               $QDOC_INDEX_DIR/qtgui/qtgui.index \
               $QDOC_INDEX_DIR/qthelp/qthelp.index \
               $QDOC_INDEX_DIR/qtquickcontrols/qtquickcontrols.index \
+              $QDOC_INDEX_DIR/qtquickcontrols2/qtquickcontrols2.index \
               $QDOC_INDEX_DIR/qtquickextras/qtquickextras.index \
               $QDOC_INDEX_DIR/qtquicklayouts/qtquicklayouts.index \
               $QDOC_INDEX_DIR/qtlinguist/qtlinguist.index \
               $QDOC_INDEX_DIR/qtscript/qtscript.index \
+              $QDOC_INDEX_DIR/qtscxml/qtscxml.index \
               $QDOC_INDEX_DIR/qtsensors/qtsensors.index \
               $QDOC_INDEX_DIR/qttestlib/qttestlib.index \
               $QDOC_INDEX_DIR/qtuitools/qtuitools.index \

doc/src/debugger/creator-debugger-setup.qdoc

@@ -137,7 +137,7 @@
     On OS X you can use the LLDB version delivered with Xcode or build from source.
     The minimum supported version is LLDB 320.4.
 
-    On Linux, the minimum supported version is LLDB 3.7.
+    On Linux, the minimum supported version is LLDB 3.8.
 
     \omit
 

doc/src/editors/creator-editors.qdoc

@@ -2537,6 +2537,11 @@
     \key Space. The prefix is usually a single character. Then type the search
     string (typically, a filename or class name) or the command to execute.
 
+    You can also double-click a locator filter in the filter list to use it. You
+    can use the up and down arrow keys or the \key Ctrl+P and \key Ctrl+N
+    keyboard shortcuts to move up and down the list, and then press \key Enter
+    to use the selected filter.
+
     For example, to locate symbols matching QDataStream:
 
     \list 1

doc/src/howto/creator-ui.qdoc

@@ -486,9 +486,9 @@
 
     You can change the property values permanently in the code editor.
 
-    \section2 To-Do List
+    \section2 To-Do Entries
 
-    The \uicontrol {To-Do List Entries} pane lists the BUG, FIXME, NOTE, TODO, and
+    The \uicontrol {To-Do Entries} pane lists the BUG, FIXME, NOTE, TODO, and
     WARNING keywords from the current file or from all project files. The
     keywords are organized into information, warning, and error categories.
 

doc/src/howto/creator-vcs.qdoc

@@ -481,7 +481,8 @@
 
     \section4 Working with Branches
 
-    To work with Git branches, select \uicontrol{Branches}. The checked out branch
+    To work with Git branches, select \uicontrol Tools > \uicontrol Git >
+    \uicontrol {Local Repository} > \uicontrol {Branches}. The checked out branch
     is shown in bold and underlined in the list of branches. Double-click branch
     names to edit them.
 
@@ -528,6 +529,9 @@
         \row
             \li \uicontrol Rebase
             \li Copy local commits to the updated upstream head.
+        \row
+            \li \uicontrol Reset
+            \li Hard reset the active branch to the selected branch.
         \row
             \li \uicontrol {Cherry Pick}
             \li Cherry pick the top commit from the selected branch.
@@ -540,7 +544,8 @@
 
     Patches are rewriting instructions that can be applied to a set of files.
     To apply a patch file that is open in \QC, select \uicontrol Tools > \uicontrol Git >
-    \uicontrol {Local Repository} > \uicontrol {Apply from Editor}.
+    \uicontrol {Local Repository} > \uicontrol Patch >
+    \uicontrol {Apply from Editor}.
 
     To select the patch file to apply from the file system, select
     \uicontrol {Apply from File}.

doc/src/projects/creator-projects-creating.qdoc

@@ -241,6 +241,15 @@
             information on how version control systems are integrated in
             \QC, see \l{Using Version Control Systems}
 
+        \li Import as qmake Project
+
+            Import an existing project that does not use any of the supported
+            build systems: qmake, Qbs, CMake, or Autotools. The wizard creates
+            a qmake .pro file, which enables you to use \QC as a code editor and
+            as a launcher for debugging and analysis tools. However, if you want
+            to build the project, you might need to edit the generated .pro
+            file.
+
         \li Import Existing Project
 
             Import an existing project that does not use any of the supported
@@ -286,6 +295,10 @@
 
         \list
 
+            \li Qt item model source and header files that you can use to create
+                classes derived from QAbstractItemModel, QAbstractTableModel, or
+                QAbstractListModel.
+
             \li \QD forms and \QD form classes, which specify parts of user
                 interfaces in Qt widget based projects
 
@@ -293,18 +306,32 @@
             application executable
 
         \li QML files, which specify items in Qt Quick projects.
-            \uicontrol {Qt Quick 1} creates a QML file that imports Qt Quick 1.1 and
+            \uicontrol {QML File (Qt Quick 2)} creates a QML file that imports
-            \uicontrol {Qt Quick 2} creates a QML file that imports Qt Quick 2.0.
+            Qt Quick 2.0 and \uicontrol {Qt Quick UI File} creates an UI form
-            Select \uicontrol {Qt Quick 1} to add files to a Qt Quick 1 application
+            (\e .ui.qml) and the corresponding QML file.
-            and \uicontrol {Qt Quick 2} to add files to a Qt Quick 2 application.
-            \uicontrol {Qt Quick UI File} creates an UI form (\e .ui.qml) and
-            the corresponding QML file.
 
         \li JavaScript files that you can use to write the application logic in
             Qt Quick projects
 
         \endlist
 
+        \li Models and state charts
+
+        \list
+
+            \li Universal Modeling Language (UML) style models with structured
+                diagrams. However, the model editor uses a variant of UML and
+                provides only a subset of properties for specifying the
+                appearance of model elements. For more information, see
+                \l {Modeling}.
+
+            \li State Chart XML (SCXML) files that contain boilerplate code for
+                state machines. You can use the classes in the \l {Qt SCXML}
+                module to embed state machines created from the files in Qt
+                applications.
+
+        \endlist
+
         \li GLSL
 
             GLSL files that define fragment and vertex shaders in both Qt Quick
@@ -322,6 +349,10 @@
 
         \endlist
 
+        \li Java
+
+            Java class files that you can use to create Java classes.
+
         \li Python
 
             Python class and source files that you can use to create Python

doc/src/projects/creator-projects-settings-editor.qdoc

@@ -52,7 +52,7 @@
 
         \li Select \uicontrol Projects > \uicontrol Editor.
 
-        \li In the \uicontrol {Editor Settings} field, select \uicontrol {Custom}.
+        \li In the \uicontrol {Editor settings} field, select \uicontrol {Custom}.
 
         \li Specify text editor settings for the project.
 

doc/src/projects/creator-projects-settings-overview.qdoc

@@ -97,7 +97,7 @@
 
         \li \l{Using Clang Static Analyzer}{Clang Static Analyzer}
 
-        \li \l{To-Do List}{To-Do} (experimental)
+        \li \l{To-Do Entries}{To-Do} (experimental)
 
     \endlist
 

doc/src/qtquick/creator-mobile-app-tutorial.qdoc

@@ -98,7 +98,7 @@
                     to reference the rectangle from other places.
 
                 \li Select the \uicontrol Layout tab, and then click
-                    the \inlineimage anchor-fill-normal.png
+                    the \inlineimage anchor_fill.png
                     (\uicontrol {Fill to Parent}) button to anchor the rectangle
                     to the item.
 

doc/src/qtquick/qtquick-app-tutorial.qdoc

@@ -109,7 +109,7 @@
                 size.
 
             \li In the \uicontrol Color field, click the
-                \inlineimage button_color_none_normal.png
+                \inlineimage icon_color_none.png
                 (\uicontrol Transparent) button to make the rectangle
                 transparent.
 
@@ -131,7 +131,7 @@
             \uicontrol Library to \e topLeftRect in the navigator.
 
         \li Click \uicontrol {Layout}, and then click the
-            \inlineimage anchor-fill-normal.png
+            \inlineimage anchor_fill.png
             (\uicontrol {Fill to Parent}) button to anchor the mouse area to the
             rectangle.
 

doc/src/qtquick/qtquick-buttons.qdoc

@@ -71,7 +71,7 @@
                 the rectangle and produce rounded corners for the button.
 
             \li Select \uicontrol {Layout}, and then select the
-                \inlineimage anchor-fill-normal.png
+                \inlineimage anchor_fill.png
                 (\uicontrol {Fill to Parent}) button to anchor the rectangle to
                 the item.
 
@@ -198,7 +198,7 @@
                 for example button_up.png.
 
             \li  Click \uicontrol {Layout}, and then click the
-                \inlineimage anchor-fill-normal.png
+                \inlineimage anchor_fill.png
                 (\uicontrol {Fill to Parent}) button to anchor the border image to the
                 \uicontrol Item.
 
@@ -248,9 +248,9 @@
                 \endlist
 
             \li Click \uicontrol {Layout}, and then click the
-                \inlineimage anchor-vertical-normal.png
+                \inlineimage anchor_vertical.png
                 (\uicontrol {Set Vertical Anchor}) and
-                \inlineimage anchor-horizontal-normal.png
+                \inlineimage anchor_horizontal.png
                 (\uicontrol {Set Horizontal Anchor})
                 buttons to inherit the vertical and horizontal centering from
                 the parent.

doc/src/qtquick/qtquick-components.qdoc

@@ -90,6 +90,9 @@
     when compared to Qt Quick Controls, on which the module is based. These
     types work in conjunction with Qt Quick and Qt Quick Layouts.
 
+    Since Qt 5.7, \l {Qt Quick Controls 2} replace Qt Quick Controls 1 and
+    Qt Labs Controls.
+
     Some ready-made controls, such as a gauge, dial, status indicator, and
     tumbler, are provided by the \l {Qt Quick Extras} module.
 
@@ -104,7 +107,7 @@
     \list 1
 
         \li Select \uicontrol File > \uicontrol {New File or Project} >
-            \uicontrol {Files and Classes} > \uicontrol Qt > \uicontrol {QML File (Qt Quick 1)} or
+            \uicontrol {Files and Classes} > \uicontrol Qt >
             \uicontrol {QML File (Qt Quick 2)} > \uicontrol Choose to create a new .qml
             file.
 

doc/src/qtquick/qtquick-connection-editor.qdoc

@@ -108,13 +108,13 @@
         \li Select \uicontrol Item to select the target object whose property you want
             to change dynamically.
 
-        \li Select \uicontrol Property to specify the property to bind to a source
+        \li Select \uicontrol Property to select the property to bind to a source
             property.
 
-        \li Select \uicontrol {Source Item} to specify the object whose property you
+        \li Select \uicontrol {Source Item} to select the object whose property you
             want to use to determine the behavior of the target object.
 
-        \li Select \uicontrol {Source Property} to specify the property to bind the
+        \li Select \uicontrol {Source Property} to select the property to bind the
             target property to.
 
     \endlist

doc/src/qtquick/qtquick-creating.qdoc

@@ -92,16 +92,18 @@
             \uicontrol {Qt Quick Controls Application}, or
             \uicontrol {Qt Labs Controls Application} > \uicontrol Choose.
 
-        \li In the \uicontrol {Minimal required Qt version} field, select the Qt
+        \li For some Qt Quick applications, you must select the Qt version to
-            version to develop with. The Qt version determines the Qt Quick
+            develop with in the \uicontrol {Minimal required Qt version} field.
-            imports that are used in the QML files.
+            The Qt version determines the Qt Quick imports that are used in the
+            QML files.
 
-        \li Select the \uicontrol {With .ui.qml file} check box to create an UI
+        \li For some Qt Quick applications, you can select the
+            \uicontrol {With .ui.qml file} check box to create an UI
             form that can contain a subset of the QML language. Similarly as
             with the UI forms for \QD, it is recommended that you use \QMLD to
             edit the UI forms. For more information, see \l{Qt Quick UI Forms}.
 
-        \li For a Qt Quick Controls application, you can also select the
+        \li For some Qt Quick applications, you can also select the
             \uicontrol {Enable native styling} check box. \QC adds a dependency
             to the Qt Widgets module to the \c .pro file.
 

doc/src/qtquick/qtquick-designer.qdoc

@@ -113,7 +113,7 @@
     you remove an item, the child items are also removed.
 
     You can show and hide items to focus on specific parts of the application.
-    Click the \inlineimage button_color_none_normal.png
+    Click the \inlineimage icon_color_none.png
     (\uicontrol Transparent) button to change the visibility of an item on the
     canvas. To change the
     visibility of an item in the application, select the \uicontrol Visibility

doc/src/qtquick/qtquick-screens.qdoc

@@ -57,6 +57,9 @@
     when compared to Qt Quick Controls, on which the module is based. These
     types work in conjunction with Qt Quick and Qt Quick Layouts.
 
+    Since Qt 5.7, \l {Qt Quick Controls 2} replace Qt Quick Controls 1 and
+    Qt Labs Controls.
+
     \section1 Adding Components to Screens
 
     \list 1

doc/src/qtquick/qtquick-uiforms-tutorial.qdoc

@@ -73,7 +73,7 @@
 
         \li Select the split view in the navigator, then select the
             \uicontrol Layout tab in \uicontrol Properties (4), and then click
-            the \inlineimage anchor-fill-normal.png
+            the \inlineimage anchor_fill.png
             (\uicontrol {Fill to Parent}) button to anchor the split view to the
             item.
 

qbs/imports/QtcAutotest.qbs

@@ -26,7 +26,7 @@ QtcProduct {
     // The following would be conceptually right, but does not work currently as some autotests
     // (e.g. extensionsystem) do not work when installed, because they want hardcoded
     // absolute paths to resources in the build directory.
-    //    cpp.rpaths: qbs.targetOS.contains("osx")
+    //    cpp.rpaths: qbs.targetOS.contains("macos")
     //            ? ["@loader_path/../Frameworks", "@loader_path/../PlugIns"]
     //            : ["$ORIGIN/../" + qtc.libDirName + "/qtcreator",
     //               "$ORIGIN/../" qtc.libDirName + "/qtcreator/plugins"]

qbs/imports/QtcDocumentation.qbs

@@ -28,7 +28,7 @@ Product {
 
     Group {
         fileTagsFilter: ["qch"]
-        qbs.install: !qbs.targetOS.contains("osx")
+        qbs.install: !qbs.targetOS.contains("macos")
         qbs.installDir: qtc.ide_doc_path
     }
 }

qbs/imports/QtcFunctions/functions.js

@@ -4,7 +4,7 @@ function qtLibraryName(qbs, name)
     if (qbs.debugInformation) {
         if (qbs.targetOS.contains("windows"))
             return name + "d";
-        else if (qbs.targetOS.contains("osx"))
+        else if (qbs.targetOS.contains("macos"))
             return name + "_debug";
     }
     return name;

qbs/imports/QtcLibrary.qbs

@@ -18,14 +18,14 @@ QtcProduct {
         var flags = base;
         if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc"))
             flags.push("/INCREMENTAL:NO"); // Speed up startup time when debugging with cdb
-        if (qbs.targetOS.contains("osx"))
+        if (qbs.targetOS.contains("macos"))
             flags.push("-compatibility_version", qtc.qtcreator_compat_version);
         return flags;
     }
-    cpp.sonamePrefix: qbs.targetOS.contains("osx")
+    cpp.sonamePrefix: qbs.targetOS.contains("macos")
             ? "@rpath"
             : undefined
-    cpp.rpaths: qbs.targetOS.contains("osx")
+    cpp.rpaths: qbs.targetOS.contains("macos")
             ? ["@loader_path/../Frameworks"]
             : ["$ORIGIN", "$ORIGIN/.."]
     property string libIncludeBase: ".." // #include <lib/header.h>

qbs/imports/QtcPlugin.qbs

@@ -27,17 +27,17 @@ QtcProduct {
 
     cpp.internalVersion: ""
     cpp.defines: base.concat([name.toUpperCase() + "_LIBRARY"])
-    cpp.sonamePrefix: qbs.targetOS.contains("osx")
+    cpp.sonamePrefix: qbs.targetOS.contains("macos")
         ? "@rpath"
         : undefined
-    cpp.rpaths: qbs.targetOS.contains("osx")
+    cpp.rpaths: qbs.targetOS.contains("macos")
         ? ["@loader_path/../Frameworks", "@loader_path/../PlugIns"]
         : ["$ORIGIN", "$ORIGIN/.."]
     cpp.linkerFlags: {
         var flags = base;
         if (qbs.buildVariant == "debug" && qbs.toolchain.contains("msvc"))
             flags.push("/INCREMENTAL:NO"); // Speed up startup time when debugging with cdb
-        if (qbs.targetOS.contains("osx"))
+        if (qbs.targetOS.contains("macos"))
             flags.push("-compatibility_version", qtc.qtcreator_compat_version);
         return flags;
     }

qbs/imports/QtcTool.qbs

@@ -12,7 +12,7 @@ QtcProduct {
                                                        '/' + qtc.ide_library_path);
         var relativePathToPlugins = FileInfo.relativePath('/' + qtc.ide_libexec_path,
                                                           '/' + qtc.ide_plugin_path);
-        var prefix = qbs.targetOS.contains("osx") ? "@executable_path" : "$ORIGIN";
+        var prefix = qbs.targetOS.contains("macos") ? "@executable_path" : "$ORIGIN";
         return [
             FileInfo.joinPaths(prefix, relativePathToLibs),
             FileInfo.joinPaths(prefix, relativePathToPlugins)

qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs

@@ -8,7 +8,7 @@ Module {
     property bool enableProjectFileUpdates: true
     property bool installApiHeaders: false
     property string libInstallDir: qtc.ide_library_path
-    property stringList libRPaths: qbs.targetOS.contains("osx")
+    property stringList libRPaths: qbs.targetOS.contains("macos")
             ? ["@loader_path/" + FileInfo.relativePath('/' + appInstallDir, '/' + libInstallDir)]
             : ["$ORIGIN/..", "$ORIGIN/../" + qtc.ide_library_path]
     property string resourcesInstallDir: qtc.ide_data_path + "/qbs"

qbs/modules/qtc/qtc.qbs

@@ -16,10 +16,10 @@ Module {
             + ide_compat_version_minor + '.' + ide_compat_version_release
 
     property string libDirName: "lib"
-    property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin"
+    property string ide_app_path: qbs.targetOS.contains("macos") ? "" : "bin"
-    property string ide_app_target: qbs.targetOS.contains("osx") ? "Qt Creator" : "qtcreator"
+    property string ide_app_target: qbs.targetOS.contains("macos") ? "Qt Creator" : "qtcreator"
     property string ide_library_path: {
-        if (qbs.targetOS.contains("osx"))
+        if (qbs.targetOS.contains("macos"))
             return ide_app_target + ".app/Contents/Frameworks"
         else if (qbs.targetOS.contains("windows"))
             return ide_app_path
@@ -27,24 +27,24 @@ Module {
             return libDirName + "/qtcreator"
     }
     property string ide_plugin_path: {
-        if (qbs.targetOS.contains("osx"))
+        if (qbs.targetOS.contains("macos"))
             return ide_app_target + ".app/Contents/PlugIns"
         else if (qbs.targetOS.contains("windows"))
             return libDirName + "/qtcreator/plugins"
         else
             return ide_library_path + "/plugins"
     }
-    property string ide_data_path: qbs.targetOS.contains("osx")
+    property string ide_data_path: qbs.targetOS.contains("macos")
             ? ide_app_target + ".app/Contents/Resources"
             : "share/qtcreator"
-    property string ide_libexec_path: qbs.targetOS.contains("osx")
+    property string ide_libexec_path: qbs.targetOS.contains("macos")
             ? ide_data_path : qbs.targetOS.contains("windows")
             ? ide_app_path
             : "libexec/qtcreator"
-    property string ide_bin_path: qbs.targetOS.contains("osx")
+    property string ide_bin_path: qbs.targetOS.contains("macos")
             ? ide_app_target + ".app/Contents/MacOS"
             : ide_app_path
-    property string ide_doc_path: qbs.targetOS.contains("osx")
+    property string ide_doc_path: qbs.targetOS.contains("macos")
             ? ide_data_path + "/doc"
             : "share/doc/qtcreator"
     property string ide_include_path: "include"

share/qtcreator/debugger/gdbbridge.py

@@ -256,11 +256,6 @@ class Dumper(DumperBase):
         self.qtNamespaceToReport = None
         self.interpreterBreakpointResolvers = []
 
-        # The guess does not need to be updated during a fetchVariables()
-        # as the result is fixed during that time (ignoring "active"
-        # dumpers causing loading of shared objects etc).
-        self.currentQtNamespaceGuess = None
-
     def prepare(self, args):
         self.output = []
         self.currentIName = ""
@@ -294,6 +289,11 @@ class Dumper(DumperBase):
         #warn("EXPANDED INAMES: %s" % self.expandedINames)
         #warn("WATCHERS: %s" % self.watchers)
 
+        # The guess does not need to be updated during a fetchVariables()
+        # as the result is fixed during that time (ignoring "active"
+        # dumpers causing loading of shared objects etc).
+        self.currentQtNamespaceGuess = None
+
     def listOfLocals(self):
         frame = gdb.selected_frame()
 

share/qtcreator/debugger/lldbbridge.py

@@ -206,7 +206,7 @@ class Dumper(DumperBase):
         self.currentType = ReportItem()
         self.currentNumChild = None
         self.currentMaxNumChild = None
-        self.currentPrintsAddress = None
+        self.currentPrintsAddress = True
         self.currentChildType = None
         self.currentChildNumChild = -1
         self.currentWatchers = {}
@@ -250,12 +250,14 @@ class Dumper(DumperBase):
             if item.name == '**&':
                 item.name = '*'
             self.put('name="%s",' % item.name)
+        item.savedCurrentAddress = self.currentAddress
         item.savedIName = self.currentIName
         item.savedValue = self.currentValue
         item.savedType = self.currentType
         self.currentIName = item.iname
         self.currentValue = ReportItem()
         self.currentType = ReportItem()
+        self.currentAddress = None
 
     def exitSubItem(self, item, exType, exValue, exTraceBack):
         if not exType is None:
@@ -278,10 +280,13 @@ class Dumper(DumperBase):
                 self.put('value="%s",' % self.currentValue.value)
         except:
             pass
+        if not self.currentAddress is None:
+            self.put(self.currentAddress)
         self.put('},')
         self.currentIName = item.savedIName
         self.currentValue = item.savedValue
         self.currentType = item.savedType
+        self.currentAddress = item.savedCurrentAddress
         return True
 
     def stateName(self, s):
@@ -962,7 +967,7 @@ class Dumper(DumperBase):
         #if int(addr) == 0xffffffffffffffff:
         #    raise RuntimeError("Illegal address")
         if self.currentPrintsAddress and not addr is None:
-            self.put('address="0x%x",' % int(addr))
+            self.currentAddress = 'address="0x%x",' % toInteger(addr)
 
     def isFunctionType(self, typeobj):
         if self.isGoodLldb:
@@ -1174,6 +1179,7 @@ class Dumper(DumperBase):
             return
 
         self.output = ''
+        self.currentAddress = None
         partialVariable = args.get('partialvar', "")
         isPartial = len(partialVariable) > 0
 

share/qtcreator/qmldesigner/common/DesignerScrollViewStyle.qml

@@ -29,8 +29,7 @@ import QtQuick.Controls.Styles 1.1
 
 ScrollViewStyle {
     readonly property color scrollbarColor: creatorTheme.BackgroundColorDark
-    readonly property color scrollbarBorderColor: creatorTheme.QmlDesignerBackgroundColorDarker
+    readonly property color scrollBarHandleColor: creatorTheme.QmlDesignerButtonColor
-    readonly property color scrollBarHandleColor: creatorTheme.QmlDesignerBackgroundColorLighter
 
     padding {left: 0; top: 0; right: 0; bottom: 0}
 
@@ -38,15 +37,11 @@ ScrollViewStyle {
         height: 10
         width: 10
         color: scrollbarColor
-        border.width: 1
-        border.color: scrollbarBorderColor
     }
     handle: Item {
         implicitWidth: 10
         implicitHeight: 10
         Rectangle {
-            border.color: scrollbarBorderColor
-            border.width: 1
             anchors.fill: parent
             color: scrollBarHandleColor
         }

share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml

@@ -27,12 +27,13 @@ import QtQuick 2.1
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.0
 
+Item {
     Rectangle {
-    color: creatorTheme.QmlDesignerBackgroundColorLighter
+        anchors.rightMargin: 1
-
+        anchors.topMargin: 1
-    border.color: creatorTheme.BackgroundColorDark
+        anchors.fill: parent
-    border.width: 1
 
+        color: creatorTheme.QmlDesignerButtonColor
 
         Image {
             id: itemIcon // to be set by model
@@ -80,3 +81,4 @@ Rectangle {
             }
         }
     }
+}

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentHorizontalButtons.qml

@@ -30,10 +30,11 @@ Row {
     id: alignmentHorizontalButtons
 
     RoundedPanel {
-        width: 14
+        width: 16
         height: parent.height
         roundLeft: true
         ExtendedFunctionButton {
+            x: 2
             anchors.verticalCenter: parent.verticalCenter
             backendValue: alignmentHorizontalButtons.backendValue
         }
@@ -48,6 +49,8 @@ Row {
     property bool baseStateFlag: isBaseState;
 
     onValueChanged: {
+        buttonRow.initalChecked = 0
+        buttonRow.checkedIndex = 0
         if (value !== undefined) {
             if (value === "AlignLeft") {
                 buttonRow.initalChecked = 0
@@ -92,21 +95,21 @@ Row {
 
         ButtonRowButton {
             roundLeftButton: false
-            iconSource: blueHighlight ? "images/alignmentleft-h-icon.png" : "images/alignmentleft-icon.png"
+            iconSource: "image://icons/alignment-left" + (blueHighlight ? "-h" : "")
             onClicked: {
                 if (checked)
                     backendValue.setEnumeration("Text", "AlignLeft")
             }
         }
         ButtonRowButton {
-            iconSource:  blueHighlight ? "images/alignmentcenterh-h-icon.png" : "images/alignmentcenterh-icon.png"
+            iconSource: "image://icons/alignment-center" + (blueHighlight ? "-h" : "")
             onClicked: {
                 if (checked)
                     backendValue.setEnumeration("Text", "AlignHCenter")
             }
         }
         ButtonRowButton {
-            iconSource: blueHighlight ? "images/alignmentright-h-icon.png" : "images/alignmentright-icon.png"
+            iconSource: "image://icons/alignment-right" + (blueHighlight ? "-h" : "")
             onClicked: {
                 if (checked)
                     backendValue.setEnumeration("Text", "AlignRight")

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AligmentVerticalButtons.qml

@@ -30,11 +30,12 @@ Row {
     id: alignmentVerticalButtons
 
     RoundedPanel {
-        width: 14
+        width: 16
         height: parent.height
         roundLeft: true
 
         ExtendedFunctionButton {
+            x: 2
             anchors.verticalCenter: parent.verticalCenter
             backendValue: alignmentVerticalButtons.backendValue
         }
@@ -49,6 +50,8 @@ Row {
     property bool baseStateFlag: isBaseState;
 
     onValueChanged: {
+        buttonRow.initalChecked = 0
+        buttonRow.checkedIndex = 0
         if (value !== undefined) {
             if (value === "AlignTop") {
                 buttonRow.initalChecked = 0
@@ -93,21 +96,21 @@ Row {
 
         ButtonRowButton {
             roundLeftButton: false
-            iconSource: blueHighlight ? "images/alignmenttop-h-icon.png" : "images/alignmenttop-icon.png"
+            iconSource: "image://icons/alignment-top" + (blueHighlight ? "-h" : "")
             onClicked: {
                 if (checked)
                     backendValue.setEnumeration("Text", "AlignTop")
             }
         }
         ButtonRowButton {
-            iconSource:  blueHighlight ? "images/alignmentmiddle-h-icon.png" : "images/alignmentmiddle-icon.png"
+            iconSource: "image://icons/alignment-middle" + (blueHighlight ? "-h" : "")
             onClicked: {
                 if (checked)
                     backendValue.setEnumeration("Text", "AlignVCenter")
             }
         }
         ButtonRowButton {
-            iconSource: blueHighlight ? "images/alignmentbottom-h-icon.png" : "images/alignmentbottom-icon.png"
+            iconSource: "image://icons/alignment-bottom" + (blueHighlight ? "-h" : "")
             onClicked: {
                 if (checked)
                     backendValue.setEnumeration("Text", "AlignBottom")

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/AnchorButtons.qml

@@ -33,7 +33,7 @@ ButtonRow {
     id: buttonRow
 
     ButtonRowButton {
-        iconSource: "images/anchor-top.png"
+        iconSource: "image://icons/anchor-top"
         tooltip: qsTr("Anchor item to the top.")
 
         property bool topAnchored: anchorBackend.topAnchored
@@ -53,7 +53,7 @@ ButtonRow {
     }
 
     ButtonRowButton {
-        iconSource: "images/anchor-bottom.png"
+        iconSource: "image://icons/anchor-bottom"
         tooltip: qsTr("Anchor item to the bottom.")
 
         property bool bottomAnchored: anchorBackend.bottomAnchored
@@ -74,7 +74,7 @@ ButtonRow {
     }
 
     ButtonRowButton {
-        iconSource: "images/anchor-left.png"
+        iconSource: "image://icons/anchor-left"
         tooltip: qsTr("Anchor item to the left.")
 
         property bool leftAnchored: anchorBackend.leftAnchored
@@ -94,7 +94,7 @@ ButtonRow {
     }
 
     ButtonRowButton {
-        iconSource: "images/anchor-right.png"
+        iconSource: "image://icons/anchor-right"
         tooltip: qsTr("Anchor item to the right.")
 
         property bool rightAnchored: anchorBackend.rightAnchored
@@ -119,7 +119,7 @@ ButtonRow {
 
 
     ButtonRowButton {
-        iconSource: "images/anchor-fill.png"
+        iconSource: "image://icons/anchor-fill"
         tooltip: qsTr("Fill parent item.")
 
         property bool isFilled: anchorBackend.isFilled
@@ -141,7 +141,7 @@ ButtonRow {
     }
 
     ButtonRowButton {
-        iconSource: "images/anchor-vertical.png"
+        iconSource: "image://icons/anchor-vertical"
         tooltip: qsTr("Anchor item vertically.")
 
         property bool verticalCentered: anchorBackend.verticalCentered;
@@ -163,7 +163,7 @@ ButtonRow {
     }
 
     ButtonRowButton {
-        iconSource: "images/anchor-horizontal.png"
+        iconSource: "image://icons/anchor-horizontal"
         tooltip: qsTr("Anchor item horizontally.")
 
         property bool horizontalCentered: anchorBackend.horizontalCentered;

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/BoolButtonRowButton.qml

@@ -83,7 +83,7 @@ ButtonRowButton {
 
     ExtendedFunctionButton {
         backendValue: boolButtonRowButton.backendValue
-        x: 0
+        x: 2
-        y: 4
+        anchors.verticalCenter: parent.verticalCenter
     }
 }

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ButtonRowButton.qml

@@ -65,7 +65,6 @@ Item {
         anchors.fill: parent
         RoundedPanel {
             roundLeft: isFirst() && buttonRowButton.roundLeftButton
-            roundRight: isLast()
 
             anchors.fill: parent
             visible: checked
@@ -74,19 +73,19 @@ Item {
 
         RoundedPanel {
             roundLeft: isFirst()
-            roundRight: isLast()
 
             anchors.fill: parent
             visible: !checked
-            color: creatorTheme.BackgroundColorDark
+            color: creatorTheme.QmlDesignerButtonColor
         }
     }
 
     Image {
         id: image
-        //source: iconSource
+        width: 16
+        height: 16
+        smooth: false
         anchors.centerIn: parent
-        anchors.leftMargin: leftPadding
     }
 
     ToolTipArea {

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CheckBox.qml

@@ -39,6 +39,7 @@ Controls.CheckBox {
 
     ExtendedFunctionButton {
         x: 22
+        anchors.verticalCenter: parent.verticalCenter
         backendValue: checkBox.backendValue
         visible: checkBox.enabled
     }

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ColorLogic.qml

@@ -40,7 +40,7 @@ QtObject {
     property bool highlight: textColor === __changedTextColor
 
     property color __defaultTextColor: creatorTheme.PanelTextColorLight
-    property color __changedTextColor: Constants.colorsChangedBaseText
+    readonly property color __changedTextColor: creatorTheme.QmlDesigner_HighlightColor
 
     onBackendValueChanged: {
         evaluate();
@@ -68,7 +68,7 @@ QtObject {
 
         if (baseStateFlag) {
             if (innerObject.backendValue.isInModel)
-                innerObject.textColor = Constants.colorsChangedBaseText
+                innerObject.textColor = __changedTextColor
             else
                 innerObject.textColor = creatorTheme.PanelTextColorLight
         } else {

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ComboBox.qml

@@ -112,7 +112,7 @@ Controls.ComboBox {
 
     ExtendedFunctionButton {
         x: 2
-        y: 6
+        anchors.verticalCenter: parent.verticalCenter
         backendValue: comboBox.backendValue
         visible: comboBox.enabled
     }

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/Constants.js

@@ -28,5 +28,4 @@
 var colorsDisabledText = "gray"
 var colorsDefaultText = "white"
 var colorsBoldText = "#dedede"
-var colorsChangedBaseText = "#9999ff"
 var colorsChangedStateText = "#99ccff"

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomCheckBoxStyle.qml

@@ -38,7 +38,7 @@ CheckBoxStyle {
             color: control.pressed
                    ? creatorTheme.FancyToolButtonHoverColor
                    : creatorTheme.FancyToolButtonSelectedColor
-            border.color: creatorTheme.QmlDesignerBackgroundColorDarker
+            border.color: creatorTheme.QmlDesignerBorderColor
             anchors.margins: 1
         }
         Image {

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml

@@ -35,35 +35,24 @@ ComboBoxStyle {
 
     background: Item {
         implicitWidth: 120
-        implicitHeight: 25
+        implicitHeight: 24
 
         Rectangle {
             anchors.fill: parent
             visible: !control.pressed
-            color: creatorTheme.FancyToolButtonSelectedColor
+            color: creatorTheme.QmlDesignerButtonColor
-            border.color: creatorTheme.QmlDesignerBackgroundColorDarker
+            border.color: creatorTheme.QmlDesignerBorderColor
             border.width: 1
         }
 
         Rectangle {
-            color: creatorTheme.FancyToolButtonHoverColor
+            color: creatorTheme.QmlDesignerBackgroundColorDarker
             anchors.fill: parent
             visible: control.pressed
-            border.color: creatorTheme.QmlDesignerBackgroundColorDarker
+            border.color: creatorTheme.QmlDesignerBorderColor
             border.width: 1
         }
 
-        Rectangle {
-            color: creatorTheme.IconsBaseColor
-            width: 1
-            anchors.right: imageItem.left
-            anchors.topMargin: 4
-            anchors.bottomMargin: 4
-            anchors.rightMargin: 6
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-        }
-
         Image {
             id: imageItem
             width: 8

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomSpinBoxStyle.qml

@@ -60,14 +60,14 @@ SpinBoxStyle {
             height: 4
             source: "image://icons/down-arrow"
             x: 1
-            y: 2.5 // Hack! Spinbox sets an non-int offset, somewhere
+            y: 3
         }
     }
 
     background: Rectangle {
         implicitWidth: Math.max(64, styleData.contentWidth)
-        implicitHeight: 23
+        implicitHeight: 24
-        color: creatorTheme.FancyToolButtonSelectedColor
+        color: creatorTheme.QmlDesignerBackgroundColorDarker
-        border.color: creatorTheme.QmlDesignerBackgroundColorDarker
+        border.color: creatorTheme.QmlDesignerBorderColor
     }
 }

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml

@@ -125,74 +125,99 @@ Item {
         }
     }
 
-    Rectangle {
+    Item {
-        parent: itemPane
-        visible: false
-        x: 10
-        color: "#424242"
 
-        radius: 3
+        Rectangle {
-        border.color: "black"
+             anchors.fill: parent
-        gradient: Gradient {
+             color: creatorTheme.QmlDesignerBackgroundColorDarker
-            GradientStop {color: "#2c2c2c" ; position: 0}
+             opacity: 0.6
-            GradientStop {color: "#343434" ; position: 0.15}
-            GradientStop {color: "#373737" ; position: 1.0}
         }
 
-        id: expressionDialog
+        MouseArea {
+             anchors.fill: parent
+        }
 
+
+        id: expressionDialog
+        visible: false
+        parent: itemPane
+
+        anchors.fill: parent
+
+
+
+        Rectangle {
+            x: 4
             onVisibleChanged: {
                 var pos  = itemPane.mapFromItem(extendedFunctionButton.parent, 0, 0);
                 y = pos.y + 2;
             }
 
-        width: parent.width - 20
+            width: parent.width - 8
-        height: 120
+            height: 160
+
+            radius: 2
+            color: creatorTheme.QmlDesignerBackgroundColorDarkAlternate
+            border.color: creatorTheme.QmlDesignerBorderColor
+
+            Label {
+                x: 8
+                y: 6
+                font.bold: true
+                text: qsTr("Binding Editor")
+            }
 
             Controls.TextField {
+                verticalAlignment: Text.AlignTop
                 id: textField
                 anchors.fill: parent
-            anchors.leftMargin: 4
+                anchors.leftMargin: 8
-            anchors.rightMargin: 4
+                anchors.rightMargin: 8
-            anchors.topMargin: 4
+                anchors.topMargin: 24
-            anchors.bottomMargin: 20
+                anchors.bottomMargin: 32
                 onAccepted: {
                     backendValue.expression = textField.text
                     expressionDialog.visible = false
                 }
 
                 style: TextFieldStyle {
-                textColor: Constants.colorsDefaultText
+                    textColor: creatorTheme.PanelTextColorLight
-                padding.top: 3
+                    padding.top: 6
-                padding.bottom: 1
+                    padding.bottom: 2
-                padding.left: 16
+                    padding.left: 6
-                placeholderTextColor: "gray"
+                    placeholderTextColor: creatorTheme.PanelTextColorMid
                     background: Rectangle {
                         implicitWidth: 100
                         implicitHeight: 23
-                    radius: 3
+                        radius: 2
-                    gradient: Gradient {
+                        color: creatorTheme.QmlDesignerBackgroundColorDarker
-                        GradientStop {color: "#2c2c2c" ; position: 0}
+                        border.color: creatorTheme.QmlDesignerBorderColor
-                        GradientStop {color: "#343434" ; position: 0.15}
-                        GradientStop {color: "#373737" ; position: 1.0}
-                    }
                     }
                 }
             }
 
             Row {
-            spacing: 0
+                spacing: 2
                 Button {
+                    width: 16
+                    height: 16
                     style: ButtonStyle {
-                    background: Image {
+                        background: Item{
-                        source: "images/apply.png"
+                            Image {
+                                width: 16
+                                height: 16
+                                source: "image://icons/error"
+                                opacity: {
+                                    if (control.pressed)
+                                        return 0.8;
+                                    return 1.0;
+                                }
                                 Rectangle {
-                            opacity:  control.pressed ? 0.5 : 0
+                                    z: -1
                                     anchors.fill: parent
-                            gradient: Gradient {
+                                    color: control.pressed || control.hovered ? creatorTheme.QmlDesignerBackgroundColorDarker : creatorTheme.QmlDesignerButtonColor
-                                GradientStop {color: "#606060" ; position: 0}
+                                    border.color: creatorTheme.QmlDesignerBorderColor
-                                GradientStop {color: "#404040" ; position: 0.07}
+                                    radius: 2
-                                GradientStop {color: "#303030" ; position: 1}
                                 }
                             }
                         }
@@ -203,17 +228,25 @@ Item {
                     }
                 }
                 Button {
+                    width: 16
+                    height: 16
                     style: ButtonStyle {
-                    background: Image {
+                        background: Item {
-                        source: "images/cancel.png"
+                            Image {
-
+                                width: 16
+                                height: 16
+                                source: "image://icons/ok"
+                                opacity: {
+                                    if (control.pressed)
+                                        return 0.8;
+                                    return 1.0;
+                                }
                                 Rectangle {
-                            opacity:  control.pressed ? 0.5 : 0
+                                    z: -1
                                     anchors.fill: parent
-                            gradient: Gradient {
+                                    color: control.pressed || control.hovered ? creatorTheme.QmlDesignerBackgroundColorDarker : creatorTheme.QmlDesignerButtonColor
-                                GradientStop {color: "#606060" ; position: 0}
+                                    border.color: creatorTheme.QmlDesignerBorderColor
-                                GradientStop {color: "#404040" ; position: 0.07}
+                                    radius: 2
-                                GradientStop {color: "#303030" ; position: 1}
                                 }
                             }
                         }
@@ -224,6 +257,8 @@ Item {
                 }
                 anchors.right: parent.right
                 anchors.bottom: parent.bottom
+                anchors.margins: 4
+            }
         }
     }
 

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FlickableSection.qml

@@ -51,7 +51,7 @@ Section {
             }
 
             Label {
-                text: "W"
+                text: "H"
                 width: 12
             }
 

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontComboBox.qml

@@ -68,7 +68,7 @@ Controls.ComboBox {
 
     ExtendedFunctionButton {
         x: 2
-        y: 4
+        anchors.verticalCenter: parent.verticalCenter
         backendValue: comboBox.backendValue
         visible: comboBox.enabled
     }

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontSection.qml

@@ -95,7 +95,7 @@ Section {
                 SpinBox {
                     id: sizeSpinBox
                     minimumValue: 0
-                    //visible: !sizeWidget.pixelSize
+                    visible: !sizeWidget.pixelSize
                     z: !sizeWidget.pixelSize ? 1 : 0
                     maximumValue: 400
                     backendValue: pointSize
@@ -103,7 +103,7 @@ Section {
 
                 SpinBox {
                     minimumValue: 0
-                    //visible: sizeWidget.pixelSize
+                    visible: sizeWidget.pixelSize
                     z: sizeWidget.pixelSize ? 1 : 0
                     maximumValue: 400
                     backendValue: pixelSize
@@ -113,6 +113,7 @@ Section {
             Controls.ComboBox {
                 id: sizeType
                 model: ["pixels", "points"]
+                property color textColor: creatorTheme.PanelTextColorLight
                 onCurrentIndexChanged: {
                     if (sizeWidget.isSetup)
                         return;

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/FontStyleButtons.qml

@@ -34,24 +34,24 @@ ButtonRow {
     property variant strikeout: backendValues.font_strikeout
 
     BoolButtonRowButton {
-        standardIconSource: "images/bold-icon.png"
+        standardIconSource: "image://icons/style-bold"
-        highlightedIconSource: "images/bold-h-icon.png"
+        highlightedIconSource: "image://icons/style-bold-h"
         backendValue: bold
     }
     BoolButtonRowButton {
-        standardIconSource: "images/italic-icon.png"
+        standardIconSource: "image://icons/style-italic"
-        highlightedIconSource: "images/italic-h-icon.png"
+        highlightedIconSource: "image://icons/style-italic-h"
         backendValue: italic
     }
     BoolButtonRowButton {
-        standardIconSource: "images/underline-icon.png"
+        standardIconSource: "image://icons/style-underline"
-        highlightedIconSource: "images/underline-h-icon.png"
+        highlightedIconSource: "image://icons/style-underline-h"
         backendValue: underline
     }
 
     BoolButtonRowButton {
-        standardIconSource: "images/strikeout-icon.png"
+        standardIconSource: "image://icons/style-strikeout"
-        highlightedIconSource: "images/strikeout-h-icon.png"
+        highlightedIconSource: "image://icons/style-strikeout-h"
         backendValue: strikeout
     }
 

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/IconLabel.qml

@@ -38,7 +38,7 @@ Item {
         height: 16
         Image {
             id: image
-            anchors.centerIn: parent
+            anchors.fill: parent
         }
 
     }

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/LineEdit.qml

@@ -52,7 +52,7 @@ Controls.TextField {
 
     ExtendedFunctionButton {
         x: 2
-        y: 6
+        anchors.verticalCenter: parent.verticalCenter
         backendValue: lineEdit.backendValue
         visible: lineEdit.enabled && showExtendedFunctionButton
     }
@@ -118,8 +118,8 @@ Controls.TextField {
         background: Rectangle {
             implicitWidth: 100
             implicitHeight: 24
-            color: creatorTheme.FancyToolButtonSelectedColor
+            color: creatorTheme.QmlDesignerBackgroundColorDarker
-            border.color: creatorTheme.QmlDesignerBackgroundColorDarker
+            border.color: creatorTheme.QmlDesignerBorderColor
         }
     }
 
@@ -172,10 +172,8 @@ Controls.TextField {
                 y: 1
                 Rectangle {
                     anchors.fill: parent
-                    border.color: creatorTheme.QmlDesignerBackgroundColorDarker
+                    border.color: creatorTheme.QmlDesignerBorderColor
-                    color: control.pressed
+                    color: creatorTheme.QmlDesignerBackgroundColorDarker
-                           ? creatorTheme.QmlDesignerBackgroundColorLighter
-                           : creatorTheme.FancyToolButtonHoverColor
                     opacity: control.hovered || control.pressed ? 1 : 0.75
                 }
                 Image {

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/RoundedPanel.qml

@@ -30,8 +30,8 @@ import QtQuick.Layouts 1.0
 Rectangle {
     id: panel
 
-    property bool roundLeft: false
+    property bool roundLeft: true
-    property bool roundRight: false
+    property bool roundRight: true
 
 
     /*
@@ -43,8 +43,8 @@ Rectangle {
     */
 
     border.width: roundLeft || roundRight ? 1 : 0
-    color: creatorTheme.BackgroundColorDark
+    color: creatorTheme.QmlDesignerButtonColor
-    border.color: creatorTheme.QmlDesignerBackgroundColorDarker
+    border.color: creatorTheme.QmlDesignerBorderColor
 
     Rectangle {
         anchors.fill: parent
@@ -71,7 +71,7 @@ Rectangle {
     }
 
     Rectangle {
-        color: creatorTheme.QmlDesignerBackgroundColorDarker
+        color: creatorTheme.QmlDesignerBorderColor
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
@@ -81,7 +81,7 @@ Rectangle {
     }
 
     Rectangle {
-        color: creatorTheme.QmlDesignerBackgroundColorDarker
+        color: creatorTheme.QmlDesignerBorderColor
         anchors.bottom: parent.bottom
         anchors.left: parent.left
         anchors.right: parent.right

share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/SpinBox.qml

@@ -35,7 +35,7 @@ Controls.SpinBox {
 
     ExtendedFunctionButton {
         x: 2
-        y: 4
+        anchors.verticalCenter: parent.verticalCenter
         backendValue: spinBox.backendValue
         visible: spinBox.enabled
     }

share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/AnchorRow.qml

@@ -128,7 +128,7 @@ RowLayout {
 
                 exclusive: true
                 ButtonRowButton {
-                    iconSource: verticalAnchor ? "../HelperWidgets/images/anchor-top.png" : "../HelperWidgets/images/anchor-left.png"
+                    iconSource: "image://icons/anchor-" + (verticalAnchor ? "top" : "left")
                     tooltip: verticalAnchor ? qsTr("Anchor to the top of the target.") : qsTr("Anchor to the left of the target.")
                     onClicked: {
                         if (!invertRelativeTargets)
@@ -139,14 +139,14 @@ RowLayout {
                 }
 
                 ButtonRowButton {
-                    iconSource: verticalAnchor ? "../HelperWidgets/images/anchor-vertical.png" : "../HelperWidgets/images/anchor-horizontal.png"
+                    iconSource: "image://icons/anchor-" + (verticalAnchor ? "vertical" : "horizontal")
                     tooltip: verticalAnchor ? qsTr("Anchor to the vertical center of the target.") : qsTr("Anchor to the horizontal center of the target.")
 
                     onClicked: centerButtonClicked();
                 }
 
                 ButtonRowButton {
-                    iconSource: verticalAnchor ? "../HelperWidgets/images/anchor-bottom.png" : "../HelperWidgets/images/anchor-right.png"
+                    iconSource: "image://icons/anchor-" + (verticalAnchor ? "bottom" : "right")
                     tooltip: verticalAnchor ? qsTr("Anchor to the bottom of the target.") : qsTr("Anchor to the right of the target.")
                     onClicked: {
                         if (!invertRelativeTargets)

share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/LayoutSection.qml

@@ -50,7 +50,7 @@ Section {
 
         AnchorRow {
             visible: anchorBackend.topAnchored;
-            iconSource: "../HelperWidgets/images/anchor-top.png"
+            iconSource: "image://icons/anchor-top"
             anchorMargin: backendValues.anchors_topMargin
             targetName: anchorBackend.topTarget
             onTargetChanged: {
@@ -73,7 +73,7 @@ Section {
 
         AnchorRow {
             visible: anchorBackend.bottomAnchored;
-            iconSource: "../HelperWidgets/images/anchor-bottom.png"
+            iconSource: "image://icons/anchor-bottom"
             anchorMargin: backendValues.anchors_bottomMargin
             targetName: anchorBackend.bottomTarget
             onTargetChanged: {
@@ -97,7 +97,7 @@ Section {
 
         AnchorRow {
             visible: anchorBackend.leftAnchored;
-            iconSource: "../HelperWidgets/images/anchor-left.png"
+            iconSource: "image://icons/anchor-left"
             anchorMargin: backendValues.anchors_leftMargin
             targetName: anchorBackend.leftTarget
             onTargetChanged: {
@@ -120,7 +120,7 @@ Section {
 
         AnchorRow {
             visible: anchorBackend.rightAnchored;
-            iconSource: "../HelperWidgets/images/anchor-right.png"
+            iconSource: "image://icons/anchor-right"
             anchorMargin: backendValues.anchors_rightMargin
             targetName: anchorBackend.rightTarget
             onTargetChanged: {
@@ -145,7 +145,7 @@ Section {
         AnchorRow {
             showAlternativeTargets: false
             visible: anchorBackend.horizontalCentered;
-            iconSource: "../HelperWidgets/images/anchor-horizontal.png"
+            iconSource: "image://icons/anchor-horizontal"
             anchorMargin: backendValues.anchors_horizontalCenterOffset
             targetName: anchorBackend.horizontalTarget
             onTargetChanged: {
@@ -158,7 +158,7 @@ Section {
         AnchorRow {
             showAlternativeTargets: false
             visible: anchorBackend.verticalCentered;
-            iconSource: "../HelperWidgets/images/anchor-vertical.png"
+            iconSource: "image://icons/anchor-vertical"
             anchorMargin: backendValues.anchors_verticalCenterOffset
             targetName: anchorBackend.verticalTarget
             onTargetChanged: {

share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/TargetComboBox.qml

@@ -31,6 +31,7 @@ import QtQuick.Controls 1.0 as Controls
 Controls.ComboBox {
 
     property string targetName: anchorBackend.topTarget
+    property color textColor: creatorTheme.PanelTextColorLight
 
     id: targetComboBox
 
@@ -50,5 +51,6 @@ Controls.ComboBox {
     model: anchorBackend.possibleTargetItems
 
     style: CustomComboBoxStyle {
+        textColor: targetComboBox.textColor
     }
 }

share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml

@@ -37,6 +37,7 @@ Rectangle {
     property int delegateStateImageSize
 
     color: baseColor
+    border.color: creatorTheme.QmlDesignerBorderColor
 
     MouseArea {
         anchors.fill: parent
@@ -101,9 +102,6 @@ Rectangle {
                 statesEditorModel.renameState(internalNodeId, text)
         }
 
-        // as we change the background we need to change the text
-        // color to see some text
-        textColor: creatorTheme.PanelTextColorLight
     }
 
     Item {
@@ -120,7 +118,7 @@ Rectangle {
             anchors.margins: -1
             anchors.fill: stateImage
             border.width: 1
-            border.color: "#000000"
+            border.color: creatorTheme.QmlDesignerBackgroundColorDarker
         }
         Image {
             id: stateImage

share/qtcreator/qmldesigner/statesEditorQmlSources/StatesList.qml

@@ -111,6 +111,7 @@ FocusScope {
                 background: Rectangle {
                     property color buttonBaseColor: Qt.darker(creatorTheme.QmlDesignerBackgroundColorDarkAlternate, 1.1)
                     color: control.hovered ? Qt.lighter(buttonBaseColor, 1.2)  : buttonBaseColor
+                    border.color: creatorTheme.QmlDesignerBorderColor
                     border.width: 1
                     Image {
                         source: "image://icons/plus"
@@ -147,7 +148,7 @@ FocusScope {
                 height: delegateHeight
                 isBaseState: 0 == internalNodeId
                 isCurrentState: root.currentStateInternalId == internalNodeId
-                baseColor: isCurrentState ? Qt.darker(highlightColor, 1.2) : background.color
+                baseColor: isCurrentState ? creatorTheme.QmlDesigner_HighlightColor : background.color
                 delegateStateName: stateName
                 delegateStateImageSource: stateImageSource
                 delegateStateImageSize: stateImageSize

share/qtcreator/themes/dark.creatortheme

@@ -200,6 +200,8 @@ PaletteWindowTextDisabled=textDisabled
 PaletteBaseDisabled=backgroundColorDisabled
 PaletteTextDisabled=textDisabled
 
+QmlDesigner_HighlightColor=ff46a2da
+
 [Flags]
 ComboBoxDrawTextShadow=false
 DerivePaletteFromTheme=true
@@ -214,6 +216,7 @@ FlatSideBarIcons=true
 FlatProjectsMode=true
 FlatMenuBar=true
 ToolBarIconShadow=true
+WindowColorAsBase=false
 
 [Gradients]
 DetailsWidgetHeaderGradient\1\color=0

share/qtcreator/themes/default.creatortheme

@@ -171,6 +171,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500
 ClangCodeModel_Error_TextMarkColor=ffff882f
 ClangCodeModel_Warning_TextMarkColor=ffc6c132
 
+QmlDesigner_HighlightColor=ff46a2da
+
 [Flags]
 ComboBoxDrawTextShadow=true
 DerivePaletteFromTheme=false
@@ -185,6 +187,7 @@ FlatSideBarIcons=false
 FlatProjectsMode=false
 FlatMenuBar=false
 ToolBarIconShadow=true
+WindowColorAsBase=false
 
 [Gradients]
 DetailsWidgetHeaderGradient\1\color=ffffff

share/qtcreator/themes/flat-dark.creatortheme

@@ -105,7 +105,7 @@ MenuItemTextColorNormal=text
 MiniProjectTargetSelectorBackgroundColor=shadowBackground
 MiniProjectTargetSelectorBorderColor=shadowBackground
 MiniProjectTargetSelectorSummaryBackgroundColor=shadowBackground
-MiniProjectTargetSelectorTextColor=text
+MiniProjectTargetSelectorTextColor=fancyBarsNormalTextColor
 PanelStatusBarBackgroundColor=shadowBackground
 PanelsWidgetSeparatorLineColor=0
 PanelTextColorDark=text
@@ -185,6 +185,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffff40
 ClangCodeModel_Error_TextMarkColor=ffff882f
 ClangCodeModel_Warning_TextMarkColor=ffceff40
 
+QmlDesigner_HighlightColor=ff46a2da
+
 PaletteWindow=normalBackground
 PaletteWindowText=text
 PaletteBase=normalBackground
@@ -219,6 +221,7 @@ FlatSideBarIcons=true
 FlatProjectsMode=true
 FlatMenuBar=true
 ToolBarIconShadow=true
+WindowColorAsBase=false
 
 [Gradients]
 DetailsWidgetHeaderGradient\1\color=0

share/qtcreator/themes/flat-light.creatortheme

@@ -102,7 +102,7 @@ MenuItemTextColorNormal=text
 MiniProjectTargetSelectorBackgroundColor=shadowBackground
 MiniProjectTargetSelectorBorderColor=shadowBackground
 MiniProjectTargetSelectorSummaryBackgroundColor=shadowBackground
-MiniProjectTargetSelectorTextColor=text
+MiniProjectTargetSelectorTextColor=fancyBarsNormalTextColor
 PanelStatusBarBackgroundColor=shadowBackground
 PanelsWidgetSeparatorLineColor=0
 PanelTextColorDark=text
@@ -182,6 +182,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500
 ClangCodeModel_Error_TextMarkColor=ffff882f
 ClangCodeModel_Warning_TextMarkColor=ffc6c132
 
+QmlDesigner_HighlightColor=ff46a2da
+
 [Flags]
 ComboBoxDrawTextShadow=false
 DerivePaletteFromTheme=false
@@ -196,6 +198,7 @@ FlatSideBarIcons=true
 FlatProjectsMode=false
 FlatMenuBar=false
 ToolBarIconShadow=false
+WindowColorAsBase=false
 
 [Gradients]
 DetailsWidgetHeaderGradient\1\color=0

share/qtcreator/themes/flat.creatortheme

@@ -101,7 +101,7 @@ MenuItemTextColorNormal=text
 MiniProjectTargetSelectorBackgroundColor=shadowBackground
 MiniProjectTargetSelectorBorderColor=shadowBackground
 MiniProjectTargetSelectorSummaryBackgroundColor=shadowBackground
-MiniProjectTargetSelectorTextColor=text
+MiniProjectTargetSelectorTextColor=fancyBarsNormalTextColor
 PanelStatusBarBackgroundColor=shadowBackground
 PanelsWidgetSeparatorLineColor=0
 PanelTextColorDark=text
@@ -181,6 +181,8 @@ ProjectExplorer_TaskWarn_TextMarkColor=ffffa500
 ClangCodeModel_Error_TextMarkColor=ffff882f
 ClangCodeModel_Warning_TextMarkColor=ffc6c132
 
+QmlDesigner_HighlightColor=ff46a2da
+
 [Flags]
 ComboBoxDrawTextShadow=false
 DerivePaletteFromTheme=false
@@ -195,6 +197,7 @@ FlatSideBarIcons=true
 FlatProjectsMode=false
 FlatMenuBar=false
 ToolBarIconShadow=true
+WindowColorAsBase=false
 
 [Gradients]
 DetailsWidgetHeaderGradient\1\color=0

share/share.qbs

@@ -55,7 +55,7 @@ Product {
             ]
             if (qbs.targetOS.contains("windows"))
                 list.push("notepad_win.xml");
-            else if (qbs.targetOS.contains("osx"))
+            else if (qbs.targetOS.contains("macos"))
                 list.push("vi_mac.xml");
             else
                 list.push("vi.xml");

src/app/app.qbs

@@ -2,10 +2,10 @@ import qbs
 
 QtcProduct {
     Depends { name: "bundle" }
-    Depends { name: "ib"; condition: qbs.targetOS.contains("osx") }
+    Depends { name: "ib"; condition: qbs.targetOS.contains("macos") }
 
     Properties {
-        condition: qbs.targetOS.contains("osx")
+        condition: qbs.targetOS.contains("macos")
         ib.appIconName: "qtcreator"
     }
 
@@ -23,7 +23,7 @@ QtcProduct {
     installDir: qtc.ide_bin_path
     property bool qtcRunnable: true
 
-    cpp.rpaths: qbs.targetOS.contains("osx") ? ["@executable_path/../Frameworks"]
+    cpp.rpaths: qbs.targetOS.contains("macos") ? ["@executable_path/../Frameworks"]
                                              : ["$ORIGIN/../" + qtc.libDirName + "/qtcreator"]
     cpp.includePaths: [
         project.sharedSourcesDir + "/qtsingleapplication",
@@ -51,7 +51,7 @@ QtcProduct {
 
     Group {
         name: "qtcreator.sh"
-        condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")
+        condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")
         files: "../../bin/qtcreator.sh"
         qbs.install: true
         qbs.installDir: "bin"
@@ -74,7 +74,7 @@ QtcProduct {
     }
 
     Group {
-        condition: qbs.targetOS.contains("osx")
+        condition: qbs.targetOS.contains("macos")
         fileTagsFilter: ["aggregate_infoplist", "pkginfo", "compiled_assetcatalog"]
         qbs.install: true
         qbs.installSourceBase: product.buildDirectory

src/libs/cplusplus/pp-engine.cpp

@@ -762,6 +762,11 @@ QByteArray Preprocessor::run(const QString &fileName,
     return preprocessed;
 }
 
+void Preprocessor::setCancelChecker(const Preprocessor::CancelChecker &cancelChecker)
+{
+    m_cancelChecker = cancelChecker;
+}
+
 bool Preprocessor::expandFunctionlikeMacros() const
 {
     return m_expandFunctionlikeMacros;
@@ -1636,6 +1641,9 @@ void Preprocessor::handlePreprocessorDirective(PPToken *tk)
 
 void Preprocessor::handleIncludeDirective(PPToken *tk, bool includeNext)
 {
+    if (m_cancelChecker && m_cancelChecker())
+        return;
+
     m_state.m_lexer->setScanAngleStringLiteralTokens(true);
     lex(tk); // consume "include" token
     m_state.m_lexer->setScanAngleStringLiteralTokens(false);

src/libs/cplusplus/pp-engine.h

@@ -56,6 +56,8 @@
 #include <QByteArray>
 #include <QPair>
 
+#include <functional>
+
 namespace CPlusPlus {
 
 class Environment;
@@ -81,6 +83,9 @@ public:
     QByteArray run(const QString &filename, const QByteArray &source,
                    bool noLines = false, bool markGeneratedTokens = true);
 
+    using CancelChecker = std::function<bool()>;
+    void setCancelChecker(const CancelChecker &cancelChecker);
+
     bool expandFunctionlikeMacros() const;
     void setExpandFunctionlikeMacros(bool expandFunctionlikeMacros);
 
@@ -253,6 +258,7 @@ private:
     Client *m_client;
     Environment *m_env;
     QByteArray m_scratchBuffer;
+    CancelChecker m_cancelChecker;
 
     bool m_expandFunctionlikeMacros;
     bool m_keepComments;