140 files changed, 1555 insertions, 1268 deletions

diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 8ab0e01874..01dde2a59f 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -9475,6 +9475,13 @@
     libraries on devices. Then select the device as the target before you
     start debugging.
 
+    \section1 Mixed C++/QML Debugging
+
+    You can debug both the C++ and QML parts of your application at the same time:
+    Select the checkboxes for both languages in the \gui{Run Settings}. However,
+    C++ breakpoints will be ignored until the debugger has attached also to the QML
+    engine.
+
     \section1 Starting QML Debugging
 
     To start the application, choose \gui {Debug > Start Debugging
diff --git a/share/qtcreator/welcomescreen/components/Button.qml b/lib/qtcreator/qtcomponents/Button.qml
index d7a3490f59..d7a3490f59 100644
--- a/share/qtcreator/welcomescreen/components/Button.qml
+++ b/lib/qtcreator/qtcomponents/Button.qml
diff --git a/share/qtcreator/welcomescreen/components/ButtonRow.qml b/lib/qtcreator/qtcomponents/ButtonRow.qml
index b2cba92849..b2cba92849 100644
--- a/share/qtcreator/welcomescreen/components/ButtonRow.qml
+++ b/lib/qtcreator/qtcomponents/ButtonRow.qml
diff --git a/share/qtcreator/welcomescreen/components/CheckBox.qml b/lib/qtcreator/qtcomponents/CheckBox.qml
index b8b94ca77f..b8b94ca77f 100644
--- a/share/qtcreator/welcomescreen/components/CheckBox.qml
+++ b/lib/qtcreator/qtcomponents/CheckBox.qml
diff --git a/share/qtcreator/welcomescreen/components/ChoiceList.qml b/lib/qtcreator/qtcomponents/ChoiceList.qml
index cf72493421..cf72493421 100644
--- a/share/qtcreator/welcomescreen/components/ChoiceList.qml
+++ b/lib/qtcreator/qtcomponents/ChoiceList.qml
diff --git a/share/qtcreator/welcomescreen/components/ContextMenu.qml b/lib/qtcreator/qtcomponents/ContextMenu.qml
index 9592a2068c..9592a2068c 100644
--- a/share/qtcreator/welcomescreen/components/ContextMenu.qml
+++ b/lib/qtcreator/qtcomponents/ContextMenu.qml
diff --git a/share/qtcreator/welcomescreen/components/Dial.qml b/lib/qtcreator/qtcomponents/Dial.qml
index 9793b46be1..9793b46be1 100644
--- a/share/qtcreator/welcomescreen/components/Dial.qml
+++ b/lib/qtcreator/qtcomponents/Dial.qml
diff --git a/share/qtcreator/welcomescreen/components/Frame.qml b/lib/qtcreator/qtcomponents/Frame.qml
index f101cb6b01..f101cb6b01 100644
--- a/share/qtcreator/welcomescreen/components/Frame.qml
+++ b/lib/qtcreator/qtcomponents/Frame.qml
diff --git a/share/qtcreator/welcomescreen/components/GroupBox.qml b/lib/qtcreator/qtcomponents/GroupBox.qml
index b9de3ad662..b9de3ad662 100644
--- a/share/qtcreator/welcomescreen/components/GroupBox.qml
+++ b/lib/qtcreator/qtcomponents/GroupBox.qml
diff --git a/share/qtcreator/welcomescreen/components/Menu.qml b/lib/qtcreator/qtcomponents/Menu.qml
index 8db25dbcae..8db25dbcae 100644
--- a/share/qtcreator/welcomescreen/components/Menu.qml
+++ b/lib/qtcreator/qtcomponents/Menu.qml
diff --git a/share/qtcreator/welcomescreen/components/MenuItem.qml b/lib/qtcreator/qtcomponents/MenuItem.qml
index d02b3500a6..d02b3500a6 100644
--- a/share/qtcreator/welcomescreen/components/MenuItem.qml
+++ b/lib/qtcreator/qtcomponents/MenuItem.qml
diff --git a/share/qtcreator/welcomescreen/components/ProgressBar.qml b/lib/qtcreator/qtcomponents/ProgressBar.qml
index 358993554d..358993554d 100644
--- a/share/qtcreator/welcomescreen/components/ProgressBar.qml
+++ b/lib/qtcreator/qtcomponents/ProgressBar.qml
diff --git a/share/qtcreator/welcomescreen/components/RadioButton.qml b/lib/qtcreator/qtcomponents/RadioButton.qml
index 9045158fb6..9045158fb6 100644
--- a/share/qtcreator/welcomescreen/components/RadioButton.qml
+++ b/lib/qtcreator/qtcomponents/RadioButton.qml
diff --git a/share/qtcreator/welcomescreen/components/ScrollArea.qml b/lib/qtcreator/qtcomponents/ScrollArea.qml
index 497239e28a..497239e28a 100644
--- a/share/qtcreator/welcomescreen/components/ScrollArea.qml
+++ b/lib/qtcreator/qtcomponents/ScrollArea.qml
diff --git a/share/qtcreator/welcomescreen/components/ScrollBar.qml b/lib/qtcreator/qtcomponents/ScrollBar.qml
index 18ed13bd54..aa9ce5e704 100644
--- a/share/qtcreator/welcomescreen/components/ScrollBar.qml
+++ b/lib/qtcreator/qtcomponents/ScrollBar.qml
@@ -32,7 +32,6 @@
 
 import QtQuick 1.0
 import "custom" as Components
-import "plugin"
 
 Item {
     id: scrollbar
diff --git a/share/qtcreator/welcomescreen/components/Slider.qml b/lib/qtcreator/qtcomponents/Slider.qml
index ca2c5a49fe..ca2c5a49fe 100644
--- a/share/qtcreator/welcomescreen/components/Slider.qml
+++ b/lib/qtcreator/qtcomponents/Slider.qml
diff --git a/share/qtcreator/welcomescreen/components/SpinBox.qml b/lib/qtcreator/qtcomponents/SpinBox.qml
index a929adfa72..a929adfa72 100644
--- a/share/qtcreator/welcomescreen/components/SpinBox.qml
+++ b/lib/qtcreator/qtcomponents/SpinBox.qml
diff --git a/share/qtcreator/welcomescreen/components/SplitterRow.qml b/lib/qtcreator/qtcomponents/SplitterRow.qml
index ced970e27f..ced970e27f 100644
--- a/share/qtcreator/welcomescreen/components/SplitterRow.qml
+++ b/lib/qtcreator/qtcomponents/SplitterRow.qml
diff --git a/share/qtcreator/welcomescreen/components/Switch.qml b/lib/qtcreator/qtcomponents/Switch.qml
index fcc54094c1..fcc54094c1 100644
--- a/share/qtcreator/welcomescreen/components/Switch.qml
+++ b/lib/qtcreator/qtcomponents/Switch.qml
diff --git a/share/qtcreator/welcomescreen/components/Tab.qml b/lib/qtcreator/qtcomponents/Tab.qml
index 520f07db75..520f07db75 100644
--- a/share/qtcreator/welcomescreen/components/Tab.qml
+++ b/lib/qtcreator/qtcomponents/Tab.qml
diff --git a/share/qtcreator/welcomescreen/components/TabBar.qml b/lib/qtcreator/qtcomponents/TabBar.qml
index 27d648f0b1..27d648f0b1 100644
--- a/share/qtcreator/welcomescreen/components/TabBar.qml
+++ b/lib/qtcreator/qtcomponents/TabBar.qml
diff --git a/share/qtcreator/welcomescreen/components/TabFrame.qml b/lib/qtcreator/qtcomponents/TabFrame.qml
index d9e730dade..d9e730dade 100644
--- a/share/qtcreator/welcomescreen/components/TabFrame.qml
+++ b/lib/qtcreator/qtcomponents/TabFrame.qml
diff --git a/share/qtcreator/welcomescreen/components/TableColumn.qml b/lib/qtcreator/qtcomponents/TableColumn.qml
index 9081f6af13..9081f6af13 100644
--- a/share/qtcreator/welcomescreen/components/TableColumn.qml
+++ b/lib/qtcreator/qtcomponents/TableColumn.qml
diff --git a/share/qtcreator/welcomescreen/components/TableView.qml b/lib/qtcreator/qtcomponents/TableView.qml
index 132610c3f6..132610c3f6 100644
--- a/share/qtcreator/welcomescreen/components/TableView.qml
+++ b/lib/qtcreator/qtcomponents/TableView.qml
diff --git a/share/qtcreator/welcomescreen/components/TextArea.qml b/lib/qtcreator/qtcomponents/TextArea.qml
index c222e9ecc3..c222e9ecc3 100644
--- a/share/qtcreator/welcomescreen/components/TextArea.qml
+++ b/lib/qtcreator/qtcomponents/TextArea.qml
diff --git a/share/qtcreator/welcomescreen/components/TextField.qml b/lib/qtcreator/qtcomponents/TextField.qml
index c9ce0959f1..c9ce0959f1 100644
--- a/share/qtcreator/welcomescreen/components/TextField.qml
+++ b/lib/qtcreator/qtcomponents/TextField.qml
diff --git a/share/qtcreator/welcomescreen/components/ToolBar.qml b/lib/qtcreator/qtcomponents/ToolBar.qml
index a33fd69e3b..a33fd69e3b 100644
--- a/share/qtcreator/welcomescreen/components/ToolBar.qml
+++ b/lib/qtcreator/qtcomponents/ToolBar.qml
diff --git a/share/qtcreator/welcomescreen/components/ToolButton.qml b/lib/qtcreator/qtcomponents/ToolButton.qml
index 2747947d5d..2747947d5d 100644
--- a/share/qtcreator/welcomescreen/components/ToolButton.qml
+++ b/lib/qtcreator/qtcomponents/ToolButton.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/BasicButton.qml b/lib/qtcreator/qtcomponents/custom/BasicButton.qml
index 79ceb40b51..79ceb40b51 100644
--- a/share/qtcreator/welcomescreen/components/custom/BasicButton.qml
+++ b/lib/qtcreator/qtcomponents/custom/BasicButton.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/Button.qml b/lib/qtcreator/qtcomponents/custom/Button.qml
index f3a4af3adf..f3a4af3adf 100644
--- a/share/qtcreator/welcomescreen/components/custom/Button.qml
+++ b/lib/qtcreator/qtcomponents/custom/Button.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/ButtonColumn.qml b/lib/qtcreator/qtcomponents/custom/ButtonColumn.qml
index 4a1fe634eb..4a1fe634eb 100644
--- a/share/qtcreator/welcomescreen/components/custom/ButtonColumn.qml
+++ b/lib/qtcreator/qtcomponents/custom/ButtonColumn.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/ButtonGroup.js b/lib/qtcreator/qtcomponents/custom/ButtonGroup.js
index 19d05fee33..19d05fee33 100644
--- a/share/qtcreator/welcomescreen/components/custom/ButtonGroup.js
+++ b/lib/qtcreator/qtcomponents/custom/ButtonGroup.js
diff --git a/share/qtcreator/welcomescreen/components/custom/ButtonRow.qml b/lib/qtcreator/qtcomponents/custom/ButtonRow.qml
index 1f1ceeb5b2..1f1ceeb5b2 100644
--- a/share/qtcreator/welcomescreen/components/custom/ButtonRow.qml
+++ b/lib/qtcreator/qtcomponents/custom/ButtonRow.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/CheckBox.qml b/lib/qtcreator/qtcomponents/custom/CheckBox.qml
index 851b032dcc..851b032dcc 100644
--- a/share/qtcreator/welcomescreen/components/custom/CheckBox.qml
+++ b/lib/qtcreator/qtcomponents/custom/CheckBox.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/ChoiceList.qml b/lib/qtcreator/qtcomponents/custom/ChoiceList.qml
index 4da78ffa7d..4da78ffa7d 100644
--- a/share/qtcreator/welcomescreen/components/custom/ChoiceList.qml
+++ b/lib/qtcreator/qtcomponents/custom/ChoiceList.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/GroupBox.qml b/lib/qtcreator/qtcomponents/custom/GroupBox.qml
index 87b471074c..87b471074c 100644
--- a/share/qtcreator/welcomescreen/components/custom/GroupBox.qml
+++ b/lib/qtcreator/qtcomponents/custom/GroupBox.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/ProgressBar.qml b/lib/qtcreator/qtcomponents/custom/ProgressBar.qml
index 995d477fda..995d477fda 100644
--- a/share/qtcreator/welcomescreen/components/custom/ProgressBar.qml
+++ b/lib/qtcreator/qtcomponents/custom/ProgressBar.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/Slider.qml b/lib/qtcreator/qtcomponents/custom/Slider.qml
index 3e20b5582d..3e20b5582d 100644
--- a/share/qtcreator/welcomescreen/components/custom/Slider.qml
+++ b/lib/qtcreator/qtcomponents/custom/Slider.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/SpinBox.qml b/lib/qtcreator/qtcomponents/custom/SpinBox.qml
index e17b56c931..e17b56c931 100644
--- a/share/qtcreator/welcomescreen/components/custom/SpinBox.qml
+++ b/lib/qtcreator/qtcomponents/custom/SpinBox.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/SplitterRow.qml b/lib/qtcreator/qtcomponents/custom/SplitterRow.qml
index 7c70931159..7c70931159 100644
--- a/share/qtcreator/welcomescreen/components/custom/SplitterRow.qml
+++ b/lib/qtcreator/qtcomponents/custom/SplitterRow.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/TextField.qml b/lib/qtcreator/qtcomponents/custom/TextField.qml
index 4790e54f4e..4790e54f4e 100644
--- a/share/qtcreator/welcomescreen/components/custom/TextField.qml
+++ b/lib/qtcreator/qtcomponents/custom/TextField.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/behaviors/ButtonBehavior.qml b/lib/qtcreator/qtcomponents/custom/behaviors/ButtonBehavior.qml
index da8c49149b..da8c49149b 100644
--- a/share/qtcreator/welcomescreen/components/custom/behaviors/ButtonBehavior.qml
+++ b/lib/qtcreator/qtcomponents/custom/behaviors/ButtonBehavior.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/behaviors/ModalPopupBehavior.qml b/lib/qtcreator/qtcomponents/custom/behaviors/ModalPopupBehavior.qml
index 0e5da2c311..0e5da2c311 100644
--- a/share/qtcreator/welcomescreen/components/custom/behaviors/ModalPopupBehavior.qml
+++ b/lib/qtcreator/qtcomponents/custom/behaviors/ModalPopupBehavior.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/components.pro b/lib/qtcreator/qtcomponents/custom/components.pro
index be0663d709..be0663d709 100644
--- a/share/qtcreator/welcomescreen/components/custom/components.pro
+++ b/lib/qtcreator/qtcomponents/custom/components.pro
diff --git a/share/qtcreator/welcomescreen/components/custom/private/ChoiceListPopup.qml b/lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml
index 5445fdc165..5445fdc165 100644
--- a/share/qtcreator/welcomescreen/components/custom/private/ChoiceListPopup.qml
+++ b/lib/qtcreator/qtcomponents/custom/private/ChoiceListPopup.qml
diff --git a/share/qtcreator/welcomescreen/components/custom/qmldir b/lib/qtcreator/qtcomponents/custom/qmldir
index 8da1fd80f0..8da1fd80f0 100644
--- a/share/qtcreator/welcomescreen/components/custom/qmldir
+++ b/lib/qtcreator/qtcomponents/custom/qmldir
diff --git a/share/qtcreator/welcomescreen/components/images/folder_new.png b/lib/qtcreator/qtcomponents/images/folder_new.png
index 8d8bb9bd76..8d8bb9bd76 100644
--- a/share/qtcreator/welcomescreen/components/images/folder_new.png
+++ b/lib/qtcreator/qtcomponents/images/folder_new.png
diff --git a/share/qtcreator/welcomescreen/components/qmldir b/lib/qtcreator/qtcomponents/qmldir
index d33a7971d7..d33a7971d7 100644
--- a/share/qtcreator/welcomescreen/components/qmldir
+++ b/lib/qtcreator/qtcomponents/qmldir
diff --git a/lib/qtcreator/qtcomponents/qtcomponents.pro b/lib/qtcreator/qtcomponents/qtcomponents.pro
new file mode 100644
index 0000000000..9a3dc0e67f
--- /dev/null
+++ b/lib/qtcreator/qtcomponents/qtcomponents.pro
@@ -0,0 +1,57 @@
+include(../../../qtcreator.pri)
+
+TEMPLATE = app
+TARGET = phony_target3
+CONFIG -= qt separate_debug_info gdb_dwarf_index
+QT =
+LIBS =
+macx:CONFIG -= app_bundle
+
+isEmpty(vcproj) {
+    QMAKE_LINK = @: IGNORE THIS LINE
+    OBJECTS_DIR =
+    win32:CONFIG -= embed_manifest_exe
+} else {
+    CONFIG += console
+    PHONY_DEPS = .
+    phony_src.input = PHONY_DEPS
+    phony_src.output = phony.c
+    phony_src.variable_out = GENERATED_SOURCES
+    phony_src.commands = echo int main() { return 0; } > phony.c
+    phony_src.name = CREATE phony.c
+    phony_src.CONFIG += combine
+    QMAKE_EXTRA_COMPILERS += phony_src
+}
+
+DATA_FILE_PATTERNS = \
+    $$PWD/*.qml \
+    $$PWD/qmldir \
+    $$PWD/images/* \
+    $$PWD/custom/* \
+    $$PWD/custom/behaviors/* \
+    $$PWD/custom/private/*
+
+!isEmpty(copydata) {
+
+    for(data_file, DATA_FILE_PATTERNS) {
+        files = $$files($$data_file, false)
+        win32:files ~= s|\\\\|/|g
+        for(file, files):!exists($$file/*):FILES += $$file
+    }
+
+    OTHER_FILES += $$FILES
+    copy2build.input = FILES
+    copy2build.output = $$IDE_LIBRARY_PATH/qtcomponents/${QMAKE_FUNC_FILE_IN_stripSrcDir}
+    isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS
+    win32:copy2build.commands = $$QMAKE_COPY \"${QMAKE_FILE_IN}\" \"${QMAKE_FILE_OUT}\"
+    unix:copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+    copy2build.name = COPY ${QMAKE_FILE_IN}
+    copy2build.CONFIG += no_link
+    QMAKE_EXTRA_COMPILERS += copy2build
+}
+
+!macx {
+    qmlfiles.files = $$PWD/*.qml $$PWD/qmldir $$PWD/images $$PWD/custom
+    qmlfiles.path = /lib/qtcreator/qtcomponents
+    INSTALLS += qmlfiles
+}
diff --git a/qtcreator.pro b/qtcreator.pro
index 6739eb9e40..35f8c20e46 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -11,7 +11,7 @@ include(doc/doc.pri)
 TEMPLATE  = subdirs
 CONFIG   += ordered
 
-SUBDIRS = src share
+SUBDIRS = src share lib/qtcreator/qtcomponents
 
 OTHER_FILES += dist/copyright_template.txt \
     dist/changes-1.1.0 \
diff --git a/share/qtcreator/dumper/qttypes.py b/share/qtcreator/dumper/qttypes.py
index 4a757ac3ec..78d27e0a25 100644
--- a/share/qtcreator/dumper/qttypes.py
+++ b/share/qtcreator/dumper/qttypes.py
@@ -561,8 +561,19 @@ def qdump__QLinkedList(d, item):
                 d.putSubItem(Item(p["t"], item.iname, i))
                 p = p["n"]
 
+qqLocalesCount = None
 
 def qdump__QLocale(d, item):
+    # Check for uninitialized 'index' variable. Retrieve size of QLocale data array
+    # from variable in qlocale.cpp (default: 368/Qt 4.8), 368 being 'System'.
+    global qqLocalesCount
+    if qqLocalesCount is None:
+        try:
+            qqLocalesCount = int(value(qtNamespace() + 'locale_data_size'))
+        except:
+            qqLocalesCount = 368
+    index = int(item.value["p"]["index"])
+    check(index >= 0 and index <= qqLocalesCount)
     d.putStringValue(call(item.value, "name"))
     d.putNumChild(0)
     return
diff --git a/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
index a0ffd18e9e..932f22e415 100644
--- a/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
@@ -435,8 +435,12 @@ void ObjectNodeInstance::setPropertyBinding(const QString &name, const QString &
         if (oldBinding && !hasValidResetBinding(name))
             oldBinding->destroy();
         binding->update();
-        if (binding->hasError())
+        if (binding->hasError()) {
             qDebug() <<" ObjectNodeInstance.setPropertyBinding has Error: " << object() << name << expression << binding->error().toString();
+            if (property.property().userType() == QVariant::String)
+                property.write(QVariant(QString("#%1#").arg(expression)));
+        }
+
     } else {
         qWarning() << "ObjectNodeInstance.setPropertyBinding: Cannot set binding for property" << name << ": property is unknown for type";
     }
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
index 10a73dff43..047f891586 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
@@ -69,41 +69,6 @@ QWidget {
                     }
                 }
 
-                QWidget {  // 1
-                    layout: HorizontalLayout {
-
-                        Label {
-                            text: qsTr("Source size")
-                        }
-
-                        DoubleSpinBox {
-                            text: "W"
-                            alignRight: false
-                            spacing: 4
-                            singleStep: 1;
-                            enabled: anchorBackend.hasParent;
-                            backendValue: backendValues.sourceSize_width
-                            minimum: -2000;
-                            maximum: 2000;
-                            baseStateFlag: isBaseState;
-                        }
-
-                        DoubleSpinBox {
-                            singleStep: 1;
-                            text: "H"
-                            alignRight: false
-                            spacing: 4
-                            backendValue: backendValues.sourceSize_height
-                            enabled: anchorBackend.hasParent;
-                            minimum: -2000;
-                            maximum: 2000;
-                            baseStateFlag: isBaseState;
-                        }
-
-
-                    }
-                } //QWidget  //1
-
 
                 IntEditor {
                     id: pixelSize;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
index d24debbcee..e8ca763833 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
@@ -85,21 +85,6 @@ QWidget {
                     }
                 }
 
-                QWidget {
-                    layout: HorizontalLayout {
-                        Label {
-                            text: qsTr("Aliasing")
-                        }
-
-                        CheckBox {
-                            text: qsTr("Smooth")
-                            backendValue: backendValues.smooth
-                            baseStateFlag: isBaseState;
-                            checkable: true;
-                        }
-                    }
-                }
-
                 QWidget {  // 1
                     layout: HorizontalLayout {
 
@@ -135,41 +120,6 @@ QWidget {
                     }
                 } //QWidget  //1
 
-                QWidget {  // 1
-                    layout: HorizontalLayout {
-
-                        Label {
-                            text: qsTr("Painted size")
-                        }
-
-                        DoubleSpinBox {
-                            text: "W"
-                            alignRight: false
-                            spacing: 4
-                            singleStep: 1;
-                            enabled: anchorBackend.hasParent;
-                            backendValue: backendValues.paintedWidth
-                            minimum: -2000;
-                            maximum: 2000;
-                            baseStateFlag: isBaseState;
-                        }
-
-                        DoubleSpinBox {
-                            singleStep: 1;
-                            text: "H"
-                            alignRight: false
-                            spacing: 4
-                            backendValue: backendValues.paintedHeight
-                            enabled: anchorBackend.hasParent;
-                            minimum: -2000;
-                            maximum: 2000;
-                            baseStateFlag: isBaseState;
-                        }
-
-
-                    }
-                } //QWidget  //1
-
             }
         }
 
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
index 79dafeccdb..14edc0afb3 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
@@ -48,6 +48,8 @@ GroupBox {
     property variant colorAlpha: colorGroupBox.alpha
     property bool hasGradient: backendValues.gradient.isInModel
 
+    property bool gradientIsBinding: backendValues.gradient.isBound
+
     onHasGradientChanged: {
         print("onGradientInModelChanged")
         if (backendValues.gradient.isInModel) {
@@ -75,7 +77,7 @@ GroupBox {
         isSetup = true;
         gradientLine.active = false;
         colorGroupBox.setSolidButtonChecked = true;
-        if (backendValues.gradient.isInModel) {
+        if (backendValues.gradient.isInModel && !gradientIsBinding) {
             colorGroupBox.setGradientButtonChecked = true;
             gradientLine.active = true;
             gradientLine.setupGradient();
@@ -117,6 +119,8 @@ GroupBox {
         }
 
         ColorGroupBox {
+            enabled: !gradientIsBinding
+            opacity: gradientIsBinding ? 0.7 : 1
             id: colorGroupBox
             caption: qsTr("Rectangle")
             finished: finishedNotify
diff --git a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri
index 29006f5a79..6704a74c1b 100644
--- a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -5,7 +5,6 @@
 # may offer an updated version of it.
 
 QT += declarative
-CONFIG(debug, debug|release):CONFIG += declarative_debug
 
 SOURCES += $$PWD/qmlapplicationviewer.cpp
 HEADERS += $$PWD/qmlapplicationviewer.h
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index e4c5c7ec33..a1e8a2e5a1 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -6297,6 +6297,10 @@ rückgängig machen?</translation>
         <translation>Technischer Support</translation>
     </message>
     <message>
+        <source>Report Bug</source>
+        <translation type="obsolete">Fehler melden</translation>
+    </message>
+    <message>
         <source>Increase Font Size</source>
         <translation>Schrift vergrößern</translation>
     </message>
@@ -6357,6 +6361,10 @@ rückgängig machen?</translation>
         <translation>Kontexthilfe</translation>
     </message>
     <message>
+        <source>Report Bug...</source>
+        <translation>Fehler melden...</translation>
+    </message>
+    <message>
         <source>Activate Index in Help mode</source>
         <translation>Index im Modus &quot;Hilfe&quot; zeigen</translation>
     </message>
@@ -10236,6 +10244,10 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt  von einem Leerzeich
 <context>
     <name>TextEditor::BaseFileFind</name>
     <message>
+        <source>Search</source>
+        <translation>Suche</translation>
+    </message>
+    <message>
         <source>%1 found</source>
         <translation>%1 gefunden</translation>
     </message>
@@ -24444,7 +24456,7 @@ Bitte verwenden Sie den Stop-Button.</translation>
     </message>
     <message>
         <source>Attach...</source>
-        <translation>Anhängen...</translation>
+        <translation type="obsolete">Anhängen...</translation>
     </message>
     <message>
         <source>Events</source>
@@ -24484,7 +24496,7 @@ Bitte verwenden Sie den Stop-Button.</translation>
     </message>
     <message>
         <source>Detach</source>
-        <translation>Abhängen</translation>
+        <translation type="obsolete">Abhängen</translation>
     </message>
 </context>
 <context>
@@ -25447,140 +25459,140 @@ Ist das Gerät verbunden und für Netzwerkzugriff eingerichtet?</translation>
     <name>RemoteLinux::Internal::AbstractMaemoPackageCreationStep</name>
     <message>
         <source>Package up to date.</source>
-        <translation>Paket ist auf aktuellem Stand.</translation>
+        <translation type="obsolete">Paket ist auf aktuellem Stand.</translation>
     </message>
     <message>
         <source>Creating package file ...</source>
-        <translation>Erzeuge Paketdatei...</translation>
+        <translation type="obsolete">Erzeuge Paketdatei...</translation>
     </message>
     <message>
         <source>Package created.</source>
-        <translation>Paketdatei erzeugt.</translation>
+        <translation type="obsolete">Paketdatei erzeugt.</translation>
     </message>
     <message>
         <source>Packaging failed.</source>
-        <translation>Die Paketerstellung schlug fehl.</translation>
+        <translation type="obsolete">Die Paketerstellung schlug fehl.</translation>
     </message>
     <message>
         <source>Packaging error: No Qt version.</source>
-        <translation>Paketierungsfehler: Keine Qt-Version.</translation>
+        <translation type="obsolete">Paketierungsfehler: Keine Qt-Version.</translation>
     </message>
     <message>
         <source>Package Creation: Running command &apos;%1&apos;.</source>
-        <translation>Paketerstellung: Führe Kommando &apos;%1&apos; aus.</translation>
+        <translation type="obsolete">Paketerstellung: Führe Kommando &apos;%1&apos; aus.</translation>
     </message>
     <message>
         <source>Packaging error: Could not start command &apos;%1&apos;. Reason: %2</source>
-        <translation>Fehler bei Paketerstellung: Das Kommando &apos;%1&apos; konnte nicht ausgeführt werden: %2</translation>
+        <translation type="obsolete">Fehler bei Paketerstellung: Das Kommando &apos;%1&apos; konnte nicht ausgeführt werden: %2</translation>
     </message>
     <message>
         <source>Packaging Error: Command &apos;%1&apos; failed.</source>
-        <translation>Fehler bei Paketerstellung: Das Kommando &apos;%1&apos; schlug fehl.</translation>
+        <translation type="obsolete">Fehler bei Paketerstellung: Das Kommando &apos;%1&apos; schlug fehl.</translation>
     </message>
     <message>
         <source> Reason: %1</source>
-        <translation> Ursache: %1</translation>
+        <translation type="obsolete"> Ursache: %1</translation>
     </message>
     <message>
         <source>Exit code: %1</source>
-        <translation>Rückgabewert: %1</translation>
+        <translation type="obsolete">Rückgabewert: %1</translation>
     </message>
 </context>
 <context>
     <name>RemoteLinux::Internal::MaemoDebianPackageCreationStep</name>
     <message>
         <source>Create Debian Package</source>
-        <translation>Debian-Paketdatei erzeugen</translation>
+        <translation type="obsolete">Debian-Paketdatei erzeugen</translation>
     </message>
     <message>
         <source>Packaging failed.</source>
-        <translation>Die Paketerstellung schlug fehl.</translation>
+        <translation type="obsolete">Die Paketerstellung schlug fehl.</translation>
     </message>
     <message>
         <source>Could not move package files from %1 to %2.</source>
-        <translation>Die Paketdateien konnten nicht von %1 zu %2 verschoben werden.</translation>
+        <translation type="obsolete">Die Paketdateien konnten nicht von %1 zu %2 verschoben werden.</translation>
     </message>
     <message>
         <source>Your project name contains characters not allowed in Debian packages.
 They must only use lower-case letters, numbers, &apos;-&apos;, &apos;+&apos; and &apos;.&apos;.
 We will try to work around that, but you may experience problems.</source>
-        <translation>Der Projektname enthält für Debian-Paketdateien nicht zulässige Zeichen.
+        <translation type="obsolete">Der Projektname enthält für Debian-Paketdateien nicht zulässige Zeichen.
 Es dürfen nur Kleinbuchstaben, Ziffern sowie &apos;-&apos;, &apos;+&apos; und &apos;.&apos; verwendet werden.
 Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftreten.</translation>
     </message>
     <message>
         <source>Packaging failed: Foreign debian directory detected.</source>
-        <translation>Fehlschlag bei Paketerstellung: Es wurde ein fremder Debian-Ordner festgestellt.</translation>
+        <translation type="obsolete">Fehlschlag bei Paketerstellung: Es wurde ein fremder Debian-Ordner festgestellt.</translation>
     </message>
     <message>
         <source>You are not using a shadow build and there is a debian directory in your project root (&apos;%1&apos;). Qt Creator will not overwrite that directory. Please remove it or use the shadow build feature.</source>
-        <translation>Sie verwenden keinen Shadow-Build und es befindet sich ein Debian-Ordner im Hauptordner Ihres Projektes (&apos;%1&apos;). Qt Creator wird diesen Ordner nicht überschreiben. Bitte entfernen Sie den Ordner oder verwenden Sie einen Shadow-Build.</translation>
+        <translation type="obsolete">Sie verwenden keinen Shadow-Build und es befindet sich ein Debian-Ordner im Hauptordner Ihres Projektes (&apos;%1&apos;). Qt Creator wird diesen Ordner nicht überschreiben. Bitte entfernen Sie den Ordner oder verwenden Sie einen Shadow-Build.</translation>
     </message>
     <message>
         <source>Could not remove directory &apos;%1&apos;: %2</source>
-        <translation>Der Ordner &apos;%1&apos; konnte nicht entfernt werden: %2</translation>
+        <translation type="obsolete">Der Ordner &apos;%1&apos; konnte nicht entfernt werden: %2</translation>
     </message>
     <message>
         <source>Could not create Debian directory &apos;%1&apos;.</source>
-        <translation>Der Debian-Ordner %1 konnte nicht angelegt werden.</translation>
+        <translation type="obsolete">Der Debian-Ordner %1 konnte nicht angelegt werden.</translation>
     </message>
     <message>
         <source>Could not copy file &apos;%1&apos; to &apos;%2&apos;</source>
-        <translation>Die Datei &apos;%1&apos; konnte nicht nach &apos;%2&apos; kopiert werden</translation>
+        <translation type="obsolete">Die Datei &apos;%1&apos; konnte nicht nach &apos;%2&apos; kopiert werden</translation>
     </message>
     <message>
         <source>Error: Could not create file &apos;%1&apos;.</source>
-        <translation>Fehler: Die Datei &apos;%1&apos; konnte nicht erstellt werden.</translation>
+        <translation type="obsolete">Fehler: Die Datei &apos;%1&apos; konnte nicht erstellt werden.</translation>
     </message>
 </context>
 <context>
     <name>RemoteLinux::Internal::MaemoRpmPackageCreationStep</name>
     <message>
         <source>Create RPM Package</source>
-        <translation>RPM-Paket erzeugen</translation>
+        <translation type="obsolete">RPM-Paket erzeugen</translation>
     </message>
     <message>
         <source>Packaging failed.</source>
-        <translation>Die Paketerstellung schlug fehl.</translation>
+        <translation type="obsolete">Die Paketerstellung schlug fehl.</translation>
     </message>
     <message>
         <source>Could not move package file from %1 to %2.</source>
-        <translation>Die Paketdateien konnten nicht von %1 zu %2 verschoben werden.</translation>
+        <translation type="obsolete">Die Paketdateien konnten nicht von %1 zu %2 verschoben werden.</translation>
     </message>
 </context>
 <context>
     <name>RemoteLinux::Internal::CreateTarStepWidget</name>
     <message>
         <source>Create tarball:</source>
-        <translation>Tarball erzeugen:</translation>
+        <translation type="obsolete">Tarball erzeugen:</translation>
     </message>
 </context>
 <context>
     <name>RemoteLinux::Internal::MaemoTarPackageCreationStep</name>
     <message>
         <source>Create tarball</source>
-        <translation>Tarball erzeugen</translation>
+        <translation type="obsolete">Tarball erzeugen</translation>
     </message>
     <message>
         <source>Error: tar file %1 cannot be opened (%2).</source>
-        <translation>Fehler: Die tar-Datei &apos;%1&apos; kann nicht geöffnet werden (%2).</translation>
+        <translation type="obsolete">Fehler: Die tar-Datei &apos;%1&apos; kann nicht geöffnet werden (%2).</translation>
     </message>
     <message>
         <source>Error writing tar file &apos;%1&apos;: %2.</source>
-        <translation>Fehler beim Schreiben der tar-Datei &apos;%1&apos;: %2.</translation>
+        <translation type="obsolete">Fehler beim Schreiben der tar-Datei &apos;%1&apos;: %2.</translation>
     </message>
     <message>
         <source>Error reading file &apos;%1&apos;: %2.</source>
-        <translation>Fehler beim Lesen der Datei &apos;%1&apos;: %2.</translation>
+        <translation type="obsolete">Fehler beim Lesen der Datei &apos;%1&apos;: %2.</translation>
     </message>
     <message>
         <source>Cannot add file &apos;%1&apos; to tar-archive: path too long.</source>
-        <translation>Die Datei &apos;%1&apos; kann nicht zu dem Tar-Archiv hinzugefügt werden: Der Pfad ist zu lang.
+        <translation type="obsolete">Die Datei &apos;%1&apos; kann nicht zu dem Tar-Archiv hinzugefügt werden: Der Pfad ist zu lang.
 </translation>
     </message>
     <message>
         <source>Error writing tar file &apos;%1&apos;: %2</source>
-        <translation>Fehler beim Schreiben der tar-Datei &apos;%1&apos;: %2</translation>
+        <translation type="obsolete">Fehler beim Schreiben der tar-Datei &apos;%1&apos;: %2</translation>
     </message>
 </context>
 <context>
@@ -26447,7 +26459,7 @@ Möchten Sie sie zum Projekt hinzufügen?&lt;/html&gt;</translation>
     <name>Valgrind::Internal::CallgrindTool</name>
     <message>
         <source>Valgrind Function Profiler</source>
-        <translation>Valgrind-Profiling einer Funktion</translation>
+        <translation>Valgrind-Profiling der Funktionen</translation>
     </message>
     <message>
         <source>Valgrind Profile uses the &quot;callgrind&quot; tool to record function calls when a program runs.</source>
@@ -27586,12 +27598,16 @@ Erfordert Qt 4.7.4 oder neuer.</translation>
         <translation>Zeige Beispiele und Demos</translation>
     </message>
     <message>
+        <source>Tag List</source>
+        <translation>Schlüsselworte</translation>
+    </message>
+    <message>
         <source>Filter by Tag</source>
-        <translation>Filtere nach Schlüsselwort</translation>
+        <translation type="obsolete">Filtere nach Schlüsselwort</translation>
     </message>
     <message>
         <source>Tag Filter: %1</source>
-        <translation>Schlüsselwortfilter: %1</translation>
+        <translation type="obsolete">Schlüsselwortfilter: %1</translation>
     </message>
 </context>
 <context>
@@ -27722,7 +27738,7 @@ Erfordert Qt 4.7.4 oder neuer.</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
 </context>
 <context>
@@ -27958,4 +27974,151 @@ Erfordert Qt 4.7.4 oder neuer.</translation>
         <translation>Der QML-Beobachter stellt zusätzliche Debugging-Funktionalität für QML-Anwendungen zur Verfügung, wie zum Beispiel interaktives Debuggen und weitere Werkzeuge zur Untersuchung. Er muss für jede verwendete Qt-Version separat übersetzt werden. Gehen Sie auf die Qt4-Einstellungsseite, wählen Sie die betreffende Qt-Installation aus und klicken Sie auf &apos;Neu Erstellen&apos;.</translation>
     </message>
 </context>
+<context>
+    <name>ExampleDelegate</name>
+    <message>
+        <source>Tags:</source>
+        <translation>Schlüsselworte:</translation>
+    </message>
+</context>
+<context>
+    <name>RemoteLinux::AbstractMaemoPackageCreationStep</name>
+    <message>
+        <source>Package up to date.</source>
+        <translation>Paket ist auf aktuellem Stand.</translation>
+    </message>
+    <message>
+        <source>Creating package file ...</source>
+        <translation>Erzeuge Paketdatei...</translation>
+    </message>
+    <message>
+        <source>Package created.</source>
+        <translation>Paketdatei erzeugt.</translation>
+    </message>
+    <message>
+        <source>Packaging failed.</source>
+        <translation>Die Paketerstellung schlug fehl.</translation>
+    </message>
+    <message>
+        <source>Packaging error: No Qt version.</source>
+        <translation>Paketierungsfehler: Keine Qt-Version.</translation>
+    </message>
+    <message>
+        <source>Package Creation: Running command &apos;%1&apos;.</source>
+        <translation>Paketerstellung: Führe Kommando &apos;%1&apos; aus.</translation>
+    </message>
+    <message>
+        <source>Packaging error: Could not start command &apos;%1&apos;. Reason: %2</source>
+        <translation>Fehler bei Paketerstellung: Das Kommando &apos;%1&apos; konnte nicht ausgeführt werden: %2</translation>
+    </message>
+    <message>
+        <source>Packaging Error: Command &apos;%1&apos; failed.</source>
+        <translation>Fehler bei Paketerstellung: Das Kommando &apos;%1&apos; schlug fehl.</translation>
+    </message>
+    <message>
+        <source> Reason: %1</source>
+        <translation> Ursache: %1</translation>
+    </message>
+    <message>
+        <source>Exit code: %1</source>
+        <translation>Rückgabewert: %1</translation>
+    </message>
+</context>
+<context>
+    <name>RemoteLinux::MaemoDebianPackageCreationStep</name>
+    <message>
+        <source>Create Debian Package</source>
+        <translation>Debian-Paketdatei erzeugen</translation>
+    </message>
+    <message>
+        <source>Packaging failed.</source>
+        <translation>Die Paketerstellung schlug fehl.</translation>
+    </message>
+    <message>
+        <source>Could not move package files from %1 to %2.</source>
+        <translation>Die Paketdateien konnten nicht von %1 zu %2 verschoben werden.</translation>
+    </message>
+    <message>
+        <source>Your project name contains characters not allowed in Debian packages.
+They must only use lower-case letters, numbers, &apos;-&apos;, &apos;+&apos; and &apos;.&apos;.
+We will try to work around that, but you may experience problems.</source>
+        <translation>Der Projektname enthält für Debian-Paketdateien nicht zulässige Zeichen.
+Es dürfen nur Kleinbuchstaben, Ziffern sowie &apos;-&apos;, &apos;+&apos; und &apos;.&apos; verwendet werden.
+Es wird versucht eine Paketdatei zu erstellen, es können aber Probleme auftreten.</translation>
+    </message>
+    <message>
+        <source>Packaging failed: Foreign debian directory detected.</source>
+        <translation>Fehlschlag bei Paketerstellung: Es wurde ein fremder Debian-Ordner festgestellt.</translation>
+    </message>
+    <message>
+        <source>You are not using a shadow build and there is a debian directory in your project root (&apos;%1&apos;). Qt Creator will not overwrite that directory. Please remove it or use the shadow build feature.</source>
+        <translation>Sie verwenden keinen Shadow-Build und es befindet sich ein Debian-Ordner im Hauptordner Ihres Projektes (&apos;%1&apos;). Qt Creator wird diesen Ordner nicht überschreiben. Bitte entfernen Sie den Ordner oder verwenden Sie einen Shadow-Build.</translation>
+    </message>
+    <message>
+        <source>Could not remove directory &apos;%1&apos;: %2</source>
+        <translation>Der Ordner &apos;%1&apos; konnte nicht entfernt werden: %2</translation>
+    </message>
+    <message>
+        <source>Could not create Debian directory &apos;%1&apos;.</source>
+        <translation>Der Debian-Ordner %1 konnte nicht angelegt werden.</translation>
+    </message>
+    <message>
+        <source>Could not copy file &apos;%1&apos; to &apos;%2&apos;</source>
+        <translation>Die Datei &apos;%1&apos; konnte nicht nach &apos;%2&apos; kopiert werden</translation>
+    </message>
+    <message>
+        <source>Error: Could not create file &apos;%1&apos;.</source>
+        <translation>Fehler: Die Datei &apos;%1&apos; konnte nicht erstellt werden.</translation>
+    </message>
+</context>
+<context>
+    <name>RemoteLinux::MaemoRpmPackageCreationStep</name>
+    <message>
+        <source>Create RPM Package</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Packaging failed.</source>
+        <translation>Die Paketerstellung schlug fehl.</translation>
+    </message>
+    <message>
+        <source>Could not move package file from %1 to %2.</source>
+        <translation>Die Paketdateien konnten nicht von %1 zu %2 verschoben werden.</translation>
+    </message>
+</context>
+<context>
+    <name>RemoteLinux::CreateTarStepWidget</name>
+    <message>
+        <source>Create tarball:</source>
+        <translation>Tarball erzeugen:</translation>
+    </message>
+</context>
+<context>
+    <name>RemoteLinux::MaemoTarPackageCreationStep</name>
+    <message>
+        <source>Create tarball</source>
+        <translation>Tarball erzeugen</translation>
+    </message>
+    <message>
+        <source>Error: tar file %1 cannot be opened (%2).</source>
+        <translation>Fehler: Die tar-Datei &apos;%1&apos; kann nicht geöffnet werden (%2).</translation>
+    </message>
+    <message>
+        <source>Error writing tar file &apos;%1&apos;: %2.</source>
+        <translation>Fehler beim Schreiben der tar-Datei &apos;%1&apos;: %2.</translation>
+    </message>
+    <message>
+        <source>Error reading file &apos;%1&apos;: %2.</source>
+        <translation>Fehler beim Lesen der Datei &apos;%1&apos;: %2.</translation>
+    </message>
+    <message>
+        <source>Cannot add file &apos;%1&apos; to tar-archive: path too long.</source>
+        <translation>Die Datei &apos;%1&apos; kann nicht zu dem Tar-Archiv hinzugefügt werden: Der Pfad ist zu lang.
+</translation>
+    </message>
+    <message>
+        <source>Error writing tar file &apos;%1&apos;: %2</source>
+        <translation>Fehler beim Schreiben der tar-Datei &apos;%1&apos;: %2</translation>
+    </message>
+</context>
 </TS>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index b774f765d7..09d0460ab5 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -214,10 +214,10 @@
     </message>
     <message numerus="yes">
         <source>%1 %2/%n File(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1 %2 z %n pliku</numerusform>
+            <numerusform>%1 %2 z %n plików</numerusform>
+            <numerusform>%1 %2 z %n plików</numerusform>
         </translation>
     </message>
     <message>
@@ -874,6 +874,10 @@ I tak np. kod atomowego licznika referencji będzie pominięty, a pojedyncze &qu
         <source>Always try to set breakpoints in plugins automatically</source>
         <translation>Zawsze próbuj automatycznie ustawiać pułapki we wtyczkach</translation>
     </message>
+    <message>
+        <source>Stop when a qFatal is issued</source>
+        <translation>Zatrzymaj kiedy wystąpi qFatal</translation>
+    </message>
 </context>
 <context>
     <name>StartExternalDialog</name>
@@ -2136,145 +2140,6 @@ Dodaj, zmodyfikuj lub usuń filtry dokumentów, które determinują zestaw dokum
     </message>
 </context>
 <context>
-    <name>Qt4ProjectManager::Internal::GettingStartedWelcomePageWidget</name>
-    <message>
-        <source>The Qt Creator User Interface</source>
-        <translation>Interfejs użytkownika Qt Creatora</translation>
-    </message>
-    <message>
-        <source>Building and Running an Example</source>
-        <translation>Budowanie i uruchamianie przykładu</translation>
-    </message>
-    <message>
-        <source>Creating a Qt C++ Application</source>
-        <translation>Tworzenie aplikacji Qt C++</translation>
-    </message>
-    <message>
-        <source>Creating a Mobile Application</source>
-        <translation>Tworzenie aplikacji mobilnej</translation>
-    </message>
-    <message>
-        <source>Creating a Qt Quick Application</source>
-        <translation>Tworzenie aplikacji Qt Quick</translation>
-    </message>
-    <message>
-        <source>Choose an Example...</source>
-        <translation>Wybierz przykład...</translation>
-    </message>
-    <message>
-        <source>Copy Project to writable Location?</source>
-        <translation>Skopiować projekt do miejsca zapisywalnego?</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The project you are about to open is located in the write-protected location:&lt;/p&gt;&lt;blockquote&gt;%1&lt;/blockquote&gt;&lt;p&gt;Please select a writable location below and click &quot;Copy Project and Open&quot; to open a modifiable copy of the project or click &quot;Keep Project and Open&quot; to open the project in location.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You will not be able to alter or compile your project in the current location.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Projekt, który masz zamiar załadować, znajduje się w miejscu zabezpieczonym przed zapisem:&lt;/p&gt;&lt;blockquote&gt;%1&lt;/blockquote&gt;&lt;p&gt;Proszę wybrać miejsce z prawami do zapisu i kliknąć &quot;Skopiuj projekt i otwórz&quot;, żeby załadować modyfikowalną kopię projektu lub kliknąć &quot;Zostaw projekt i otwórz&quot;, żeby załadować projekt z miejsca, gdzie się obecnie znajduje.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Uwaga:&lt;/b&gt; Nie będzie można zmienić lub skompilować projektu w bieżącej lokalizacji.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&amp;Location:</source>
-        <translation>&amp;Położenie:</translation>
-    </message>
-    <message>
-        <source>&amp;Copy Project and Open</source>
-        <translation>S&amp;kopiuj projekt i otwórz</translation>
-    </message>
-    <message>
-        <source>&amp;Keep Project and Open</source>
-        <translation>Po&amp;zostaw projekt i otwórz</translation>
-    </message>
-    <message>
-        <source>Warning</source>
-        <translation>Ostrzeżenie</translation>
-    </message>
-    <message>
-        <source>The specified location already exists. Please specify a valid location.</source>
-        <translation>Podane położenie już istnieje. Podaj poprawne położenie.</translation>
-    </message>
-    <message>
-        <source>New Project</source>
-        <translation>Nowy projekt</translation>
-    </message>
-    <message>
-        <source>Cmd</source>
-        <comment>Shortcut key</comment>
-        <translation>Cmd</translation>
-    </message>
-    <message>
-        <source>Alt</source>
-        <comment>Shortcut key</comment>
-        <translation>Alt</translation>
-    </message>
-    <message>
-        <source>Ctrl</source>
-        <comment>Shortcut key</comment>
-        <translation>Ctrl</translation>
-    </message>
-    <message>
-        <source>If you add external libraries to your project, Qt Creator will automatically offer syntax highlighting and code completion.</source>
-        <translatorcomment>Po dodaniu do projektu zewnętrznej biblioteki, Qt Creator automatycznie </translatorcomment>
-        <translation>Podświetlanie składni i uzupełnianie kodu zadziała automatycznie również dla zewnętrznych bibliotek dodanych do projektu.</translation>
-    </message>
-    <message>
-        <source>You can switch between the output pane by hitting &lt;tt&gt;%1+n&lt;/tt&gt; where n is the number denoted on the buttons at the window bottom: &lt;br /&gt;&lt;br /&gt;1: Build Issues, 2: Search Results, 3: Application Output, 4: Compile Output</source>
-        <translation>Możesz przełączać panele wyjściowe naciskając &lt;tt&gt;%1+n&lt;/tt&gt;, gdzie n jest odpowiednim numerem na przycisku na dole okna:&lt;br /&gt;&lt;br /&gt;1 - Problemy podczas budowania, 2 - Wyniki wyszukiwań, 3 - Komunikaty aplikacji, 4 - Komunikaty kompilatora</translation>
-    </message>
-    <message>
-        <source>You can quickly search methods, classes, help and more using the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-editor-locator.html&quot;&gt;Locator bar&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;).</source>
-        <translation>Używając &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-editor-locator.html&quot;&gt;lokalizatora&lt;/a&gt; (&lt;tt&gt;%1+K&lt;/tt&gt;) możesz szybko znaleźć metody, klasy, itd. lub przeszukać dokumentację.</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&apos;%1&apos;&gt;Details...&lt;/a&gt;</source>
-        <translation>&lt;a href=&apos;%1&apos;&gt;Szczegóły...&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&apos;%1&apos;&gt;Take Tutorial&lt;/a&gt;</source>
-        <translation>&lt;a href=&apos;%1&apos;&gt;Otwórz samouczek&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>You can show and hide the side bar using &lt;tt&gt;%1+0&lt;tt&gt;.</source>
-        <translation>Możesz pokazać lub schować boczny pasek używając &lt;tt&gt;%1+0&lt;tt&gt;.</translation>
-    </message>
-    <message>
-        <source>You can fine tune the &lt;tt&gt;Find&lt;/tt&gt; function by selecting &amp;quot;Whole Words&amp;quot; or &amp;quot;Case Sensitive&amp;quot;. Simply click on the icons on the right end of the line edit.</source>
-        <translation>Możesz wyregulować działanie funkcji &lt;tt&gt;Znajdź&lt;/tt&gt; poprzez wybranie &amp;quot;Tylko całe słowa&amp;quot; lub &amp;quot;Uwzględniaj wielkość liter&amp;quot;. W tym celu naciśnij ikonę po prawej stronie pola edycyjnego.</translation>
-    </message>
-    <message>
-        <source>The code completion is CamelCase-aware. For example, to complete &lt;tt&gt;namespaceUri&lt;/tt&gt; you can just type &lt;tt&gt;nU&lt;/tt&gt; and hit &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</source>
-        <translation>Uzupełnianie kodu uwzględnia wielkie litery w środku nazw. Na przykład, aby uzupełnić &lt;tt&gt;namespaceUri&lt;/tt&gt; wystarczy, że napiszesz &lt;tt&gt;nU&lt;/tt&gt; i przyciśniesz &lt;tt&gt;Ctrl+spacja&lt;/tt&gt;.</translation>
-    </message>
-    <message>
-        <source>You can force code completion at any time using &lt;tt&gt;Ctrl+Space&lt;/tt&gt;.</source>
-        <translation>W każdej chwili możesz wywołać uzupełnianie kodu naciskając &lt;tt&gt;Ctrl+spacja&lt;/tt&gt;.</translation>
-    </message>
-    <message>
-        <source>You can start Qt Creator with a session by calling &lt;tt&gt;qtcreator &amp;lt;sessionname&amp;gt;&lt;/tt&gt;.</source>
-        <translation>Wywołując &lt;tt&gt;qtcreator &amp;lt;nazwa_sesji&amp;gt;&lt;/tt&gt; możesz uruchomić Qt Creatora z wybraną sesją.</translation>
-    </message>
-    <message>
-        <source>You can return to edit mode from any other mode at any time by hitting &lt;tt&gt;Escape&lt;/tt&gt;.</source>
-        <translation>Możesz zawsze powrócić do trybu edycji z każdego innego trybu naciskając &lt;tt&gt;Escape&lt;/tt&gt;.</translation>
-    </message>
-    <message>
-        <source>You can add custom build steps in the &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;build settings&lt;/a&gt;.</source>
-        <translation>Możesz dodawać własne kroki do procesu budowania w &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-settings.html&quot;&gt;ustawieniach budowania&lt;/a&gt;.</translation>
-    </message>
-    <message>
-        <source>Within a session, you can add &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-dependencies.html&quot;&gt;dependencies&lt;/a&gt; between projects.</source>
-        <translation>W ramach sesji możesz dodać &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-build-dependencies.html&quot;&gt;zależności&lt;/a&gt; pomiędzy projektami.</translation>
-    </message>
-    <message>
-        <source>You can set the preferred editor encoding for every project in &lt;tt&gt;Projects -&gt; Editor Settings -&gt; Default Encoding&lt;/tt&gt;.</source>
-        <translation>Możesz ustawić preferowane kodowanie dla wszystkich projektów w &lt;tt&gt;Projekty -&gt; Ustawienia edytora -&gt; Domyślne kodowanie plików&lt;/tt&gt;.</translation>
-    </message>
-    <message>
-        <source>You can use Qt Creator with a number of &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;revision control systems&lt;/a&gt; such as Subversion, Perforce, CVS and Git.</source>
-        <translation>Możesz używać Qt Creatora z wieloma różnymi &lt;a href=&quot;qthelp://com.nokia.qtcreator/doc/creator-version-control.html&quot;&gt;systemami kontroli wersji&lt;/a&gt; takimi jak Subversion, Perforce, CVS i Git.</translation>
-    </message>
-    <message>
-        <source>In the editor, &lt;tt&gt;F2&lt;/tt&gt; follows symbol definition, &lt;tt&gt;Shift+F2&lt;/tt&gt; toggles declaration and definition while &lt;tt&gt;F4&lt;/tt&gt; toggles header file and source file.</source>
-        <translation>Naciśnięcie w edytorze &lt;tt&gt;F2&lt;/tt&gt; powoduje skok do definicji symbolu, &lt;tt&gt;Shift+F2&lt;/tt&gt; przełącza między deklaracją a definicją, zaś &lt;tt&gt;F4&lt;/tt&gt; przełącza między plikiem nagłówkowym a plikiem źródłowym.</translation>
-    </message>
-</context>
-<context>
     <name>MakeStep</name>
     <message>
         <source>Override %1:</source>
@@ -3413,10 +3278,6 @@ Przyczyna: %3</translation>
         <translation>Uruchom CMake</translation>
     </message>
     <message>
-        <source>Arguments</source>
-        <translation>Argumenty</translation>
-    </message>
-    <message>
         <source>Please specify the path to the cmake executable. No cmake executable was found in the path.</source>
         <translation>Podaj ścieżkę do programu cmake. Programu cmake nie wykryto w ścieżce.</translation>
     </message>
@@ -3429,6 +3290,14 @@ Przyczyna: %3</translation>
         <translation>Ścieżka %1 nie pokazuje na poprawny program cmake.</translation>
     </message>
     <message>
+        <source>Arguments:</source>
+        <translation>Argumenty:</translation>
+    </message>
+    <message>
+        <source>Generator:</source>
+        <translation>Generator:</translation>
+    </message>
+    <message>
         <source>The directory %1 already contains a cbp file, which is recent enough. You can pass special arguments or change the used tool chain here and rerun CMake. Or simply finish the wizard directly.</source>
         <translation>Katalog %1 zawierający już plik cbp jest wystarczająco aktualny. Możesz przekazać specialne argumenty lub zmienić używany zestaw narzędzi i ponownie uruchomić CMake. Możesz również bezpośrednio zakończyć kreatora.</translation>
     </message>
@@ -4138,7 +4007,7 @@ Przyczyna: %3</translation>
         <translation>Zaznacz &amp;wszystko</translation>
     </message>
     <message>
-        <source>&amp;Go To Line...</source>
+        <source>&amp;Go to Line...</source>
         <translation>Przej&amp;dź do linii...</translation>
     </message>
     <message>
@@ -5336,6 +5205,10 @@ Przyczyna: %3</translation>
         <translation>Przerwij w &quot;qWarning&quot;</translation>
     </message>
     <message>
+        <source>Break on &quot;qFatal&quot;</source>
+        <translation>Przerwij w &quot;qFatal&quot;</translation>
+    </message>
+    <message>
         <source>Automatically Quit Debugger</source>
         <translation>Automatycznie zakańczaj debugger</translation>
     </message>
@@ -8203,6 +8076,10 @@ Przebudowanie projektu może pomóc w ich odnalezieniu.</translation>
         <translation>Wsparcie techniczne</translation>
     </message>
     <message>
+        <source>Report Bug...</source>
+        <translation>Zgłoś błąd...</translation>
+    </message>
+    <message>
         <source>Decrease Font Size</source>
         <translation>Zmniejsz rozmiar czcionki</translation>
     </message>
@@ -10556,6 +10433,10 @@ Wstępnie wybiera wersję desktopową Qt do budowania aplikacji (jeśli jest dos
 <context>
     <name>TextEditor::BaseFileFind</name>
     <message>
+        <source>Search</source>
+        <translation>Wyszukiwanie</translation>
+    </message>
+    <message>
         <source>%1 found</source>
         <translation>Ilość znalezionych: %1</translation>
     </message>
@@ -10772,10 +10653,6 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
         <translation>%1+E, %2+W</translation>
     </message>
     <message>
-        <source>(Un)Comment &amp;Selection</source>
-        <translation>Wykomentuj / odkomentuj &amp;selekcję</translation>
-    </message>
-    <message>
         <source>Ctrl+/</source>
         <translation>Ctrl+/</translation>
     </message>
@@ -10800,6 +10677,10 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
         <translation>Ctrl+&gt;</translation>
     </message>
     <message>
+        <source>Toggle &amp;Fold All</source>
+        <translation>&amp;Zwiń / rozwiń wszystko</translation>
+    </message>
+    <message>
         <source>Increase Font Size</source>
         <translation>Zwiększ rozmiar czcionki</translation>
     </message>
@@ -10844,6 +10725,10 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
         <translation>Ctrl+[</translation>
     </message>
     <message>
+        <source>Toggle Comment &amp;Selection</source>
+        <translation>Wykomentuj / odkomentuj &amp;selekcję</translation>
+    </message>
+    <message>
         <source>Copy &amp;Line</source>
         <translation>Skopiuj &amp;linię</translation>
     </message>
@@ -10860,10 +10745,6 @@ Następujące kodowania będą najprawdopodobniej pasowały:</translation>
         <translation>Rozwiń</translation>
     </message>
     <message>
-        <source>(Un)&amp;Fold All</source>
-        <translation>&amp;Zwiń / rozwiń wszystko</translation>
-    </message>
-    <message>
         <source>Ctrl+]</source>
         <translation>Ctrl+]</translation>
     </message>
@@ -12008,6 +11889,14 @@ aktywny tylko po wpisaniu przedrostka</translation>
 <context>
     <name>Locator::Internal::LocatorPlugin</name>
     <message>
+        <source>Type to locate</source>
+        <translation>Wpisz aby znaleźć</translation>
+    </message>
+    <message>
+        <source>Type to locate (%1)</source>
+        <translation>Wpisz aby znaleźć (%1)</translation>
+    </message>
+    <message>
         <source>Indexing</source>
         <translation>Indeksowanie</translation>
     </message>
@@ -12027,10 +11916,6 @@ aktywny tylko po wpisaniu przedrostka</translation>
         <translation>Znajdź...</translation>
     </message>
     <message>
-        <source>Type to locate</source>
-        <translation>Wpisz aby znaleźć</translation>
-    </message>
-    <message>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
@@ -12815,15 +12700,15 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
     </message>
     <message>
         <source>could not resolve the prototype %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można rozwiązać prototypu %1 klasy %2</translation>
     </message>
     <message>
         <source>could not resolve the prototype of %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie można rozwiązać prototypu klasy %1</translation>
     </message>
     <message>
         <source>prototype cycle, the last non-repeated object is %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Cykl w prototypie, ostatni nie powtórzony obiekt to %1</translation>
     </message>
     <message>
         <source>expected id</source>
@@ -14371,11 +14256,15 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
     </message>
     <message>
         <source>&amp;Restore Default View</source>
-        <translation>P&amp;rzywróć domyślny widok</translation>
+        <translation>Przywróć &amp;domyślny widok</translation>
+    </message>
+    <message>
+        <source>&amp;Go into Component</source>
+        <translation>&amp;Przejdź do komponentu</translation>
     </message>
     <message>
         <source>Toggle &amp;Left Sidebar</source>
-        <translation>Przełącz &amp;lewy boczny pasek</translation>
+        <translation>Przełącz l&amp;ewy boczny pasek</translation>
     </message>
     <message>
         <source>Toggle &amp;Right Sidebar</source>
@@ -14770,6 +14659,10 @@ Możesz przeglądać projekty przy pomocy QML Viewera bez ich uprzedniego budowa
         <translation>Nie można wykryć ABI używanego przez tę wersję Qt.</translation>
     </message>
     <message>
+        <source>No qmlviewer installed.</source>
+        <translation>Brak zainstalowanego &quot;qmlviewer&quot;.</translation>
+    </message>
+    <message>
         <source>The &quot;Open C/C++ plugin&quot; is not installed in the Symbian SDK or the Symbian SDK path is misconfigured</source>
         <translation>&quot;Open C/C++ plugin&quot; nie jest zainstalowany w Symbian SDK albo ścieżka do Symbian SDK jest niepoprawnie skonfigurowana</translation>
     </message>
@@ -14812,8 +14705,10 @@ Możesz przeglądać projekty przy pomocy QML Viewera bez ich uprzedniego budowa
         <translation>Nie można określić ścieżki instalacji Qt wersji &quot;%1&quot;.</translation>
     </message>
     <message>
-        <source>The Qt Version has no tool chain.</source>
-        <translation>Ta wersja Qt nie posiada zestawu narzędzi.</translation>
+        <source>Building helper(s) with toolchain &apos;%1&apos; ...
+</source>
+        <translation>Budowanie asystenta z zestawem narzędzi &quot;%1&quot;...
+</translation>
     </message>
     <message>
         <source>Build failed.</source>
@@ -14890,6 +14785,10 @@ Możesz przeglądać projekty przy pomocy QML Viewera bez ich uprzedniego budowa
         <source>Text Editor</source>
         <translation>Edytor tekstu</translation>
     </message>
+    <message>
+        <source>Translate this string</source>
+        <translation>Przetłumacz ten tekst</translation>
+    </message>
 </context>
 <context>
     <name>VCSBase::VCSBasePlugin</name>
@@ -15012,10 +14911,6 @@ Możesz przeglądać projekty przy pomocy QML Viewera bez ich uprzedniego budowa
         <translation>Wyświetlana ikona w menedżerze pakietu:</translation>
     </message>
     <message>
-        <source>Size is 48x48 pixels</source>
-        <translation>Rozmiar 48x48 w pikselach</translation>
-    </message>
-    <message>
         <source>Adapt Debian file:</source>
         <translation>Przyswój plik Debiana:</translation>
     </message>
@@ -15133,10 +15028,6 @@ Sprawdź dokumentację SSH zmienną środowiskową SSH_ASKPASS.</translation>
         <translation>Źródło</translation>
     </message>
     <message>
-        <source>Source size</source>
-        <translation>Rozmiar źródła</translation>
-    </message>
-    <message>
         <source>Left</source>
         <translation>Lewy</translation>
     </message>
@@ -15228,6 +15119,14 @@ Sprawdź dokumentację SSH zmienną środowiskową SSH_ASKPASS.</translation>
         <translation>Rozmiar</translation>
     </message>
     <message>
+        <source>Width</source>
+        <translation>Szerokość</translation>
+    </message>
+    <message>
+        <source>Height</source>
+        <translation>Wysokość</translation>
+    </message>
+    <message>
         <source>Lock aspect ratio</source>
         <translation>Zablokuj aspekt</translation>
     </message>
@@ -15250,18 +15149,6 @@ Sprawdź dokumentację SSH zmienną środowiskową SSH_ASKPASS.</translation>
         <source>Source size</source>
         <translation>Rozmiar źródła</translation>
     </message>
-    <message>
-        <source>Painted size</source>
-        <translation>Rozmiar powierzchni rysowania</translation>
-    </message>
-    <message>
-        <source>Aliasing</source>
-        <translation>Antyaliasing</translation>
-    </message>
-    <message>
-        <source>Smooth</source>
-        <translation>Gładki</translation>
-    </message>
 </context>
 <context>
     <name>Layout</name>
@@ -15335,6 +15222,14 @@ Sprawdź dokumentację SSH zmienną środowiskową SSH_ASKPASS.</translation>
         <translation>Prostokąt</translation>
     </message>
     <message>
+        <source>Border width</source>
+        <translation>Szerokość ramki</translation>
+    </message>
+    <message>
+        <source>Border has to be solid to change width</source>
+        <translation>Aby zmienić szerokość ramka musi być jednolita</translation>
+    </message>
+    <message>
         <source>Border</source>
         <translation>Brzeg</translation>
     </message>
@@ -15446,8 +15341,8 @@ Sprawdź dokumentację SSH zmienną środowiskową SSH_ASKPASS.</translation>
         <translation>Kursor widoczny</translation>
     </message>
     <message>
-        <source>Focus on press</source>
-        <translation>Fokus po naciśnięciu</translation>
+        <source>Active focus on press</source>
+        <translation>Uaktywnij fokus po naciśnięciu</translation>
     </message>
     <message>
         <source>Auto scroll</source>
@@ -17600,6 +17495,15 @@ zamiast w jego katalogu instalacyjnym.</translation>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;center&gt;&lt;i&gt;%1&lt;/i&gt; jest wciąż uruchomiony.&lt;center/&gt;&lt;center&gt;Wymusić zakończenie?&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
+        <source>PID %1</source>
+        <translation>PID %1</translation>
+    </message>
+    <message>
+        <source>Invalid</source>
+        <extracomment>Invalid process handle.</extracomment>
+        <translation>Niepoprawny</translation>
+    </message>
+    <message>
         <source>Force Quit</source>
         <translation>Wymuś zakończenie</translation>
     </message>
@@ -17615,12 +17519,12 @@ zamiast w jego katalogu instalacyjnym.</translation>
 <context>
     <name>ProjectExplorer::Internal::ShowInEditorTaskHandler</name>
     <message>
-        <source>&amp;Show in editor</source>
+        <source>&amp;Show in Editor</source>
         <translation>&amp;Pokaż w edytorze</translation>
     </message>
     <message>
-        <source>Show task location in an editor</source>
-        <translation>Pokaż położenie zadania w edytorze</translation>
+        <source>Show task location in an editor.</source>
+        <translation>Pokaż położenie zadania w edytorze.</translation>
     </message>
 </context>
 <context>
@@ -18311,7 +18215,7 @@ Aplikację można zbudować i zainstalować na desktopie i urządzeniach mobilny
 <context>
     <name>TaskList::Internal::StopMonitoringHandler</name>
     <message>
-        <source>Stop monitoring</source>
+        <source>Stop Monitoring</source>
         <translation>Zatrzymaj monitorowanie</translation>
     </message>
     <message>
@@ -19494,6 +19398,10 @@ Local pulls are not applied to the master branch.</source>
         <source>Emulator</source>
         <translation>Emulator</translation>
     </message>
+    <message>
+        <source>The SSH server port:</source>
+        <translation>Port serwera SSH:</translation>
+    </message>
 </context>
 <context>
     <name>MaemoPublishingWizardPageFremantleFree</name>
@@ -19783,7 +19691,7 @@ Poprzednie wersje mają ograniczenia w budowaniu odpowiednich plików SIS.</tran
     </message>
     <message>
         <source>Touch optimized navigation will make the HTML page flickable and enlarge the area of touch sensitive elements. If you use a JavaScript framework which optimizes the touch interaction, leave the checkbox unchecked.</source>
-        <translation type="unfinished">Nawigacja zoptymalizowana pod kątem urządzeń dotykowych spowoduje </translation>
+        <translation>Nawigacja zoptymalizowana pod kątem urządzeń dotykowych spowoduje miganie strony HTML i zwiększy obszar elementów czułych na dotyk. Jeśli używasz JavaScript ze zoptymalizowaną interakcją dotykową, pozostaw tę opcję niezaznaczoną.</translation>
     </message>
 </context>
 <context>
@@ -19997,6 +19905,22 @@ Poprzednie wersje mają ograniczenia w budowaniu odpowiednich plików SIS.</tran
         <source>Color editor</source>
         <translation>Edytor kolorów</translation>
     </message>
+    <message>
+        <source>Hue</source>
+        <translation>Barwa</translation>
+    </message>
+    <message>
+        <source>Saturation</source>
+        <translation>Nasycenie</translation>
+    </message>
+    <message>
+        <source>Brightness</source>
+        <translation>Jasność</translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation>Alfa</translation>
+    </message>
 </context>
 <context>
     <name>ColorTypeButtons</name>
@@ -20005,13 +19929,25 @@ Poprzednie wersje mają ograniczenia w budowaniu odpowiednich plików SIS.</tran
         <translation>Kolor jednolity</translation>
     </message>
     <message>
+        <source>Solid color (only editable in base state)</source>
+        <translation>Kolor jednolity (dostępny jedynie w stanie bazowym)</translation>
+    </message>
+    <message>
         <source>Gradient</source>
         <translation>Gradient</translation>
     </message>
     <message>
+        <source>Gradient (only editable in base state)</source>
+        <translation>Gradient (dostępny jedynie w stanie bazowym)</translation>
+    </message>
+    <message>
         <source>Transparent</source>
         <translation>Przezroczystość</translation>
     </message>
+    <message>
+        <source>Transparent (only editable in base state)</source>
+        <translation>Przezroczystość (dostępna jedynie w stanie bazowym)</translation>
+    </message>
 </context>
 <context>
     <name>QmlJS::TypeDescriptionReader</name>
@@ -20371,7 +20307,7 @@ Poprzednie wersje mają ograniczenia w budowaniu odpowiednich plików SIS.</tran
     <name>Analyzer::Internal::AnalyzerMode</name>
     <message>
         <source>Analyze</source>
-        <translation>Analizuj</translation>
+        <translation>Analiza</translation>
     </message>
 </context>
 <context>
@@ -20402,13 +20338,6 @@ Poprzednie wersje mają ograniczenia w budowaniu odpowiednich plików SIS.</tran
     </message>
 </context>
 <context>
-    <name>Analyzer::Internal::AnalyzerRunControlFactory</name>
-    <message>
-        <source>Analyzer</source>
-        <translation>Analizator</translation>
-    </message>
-</context>
-<context>
     <name>Analyzer::AnalyzerProjectSettings</name>
     <message>
         <source>Analyzer Settings</source>
@@ -20418,12 +20347,8 @@ Poprzednie wersje mają ograniczenia w budowaniu odpowiednich plików SIS.</tran
 <context>
     <name>Analyzer::IAnalyzerTool</name>
     <message>
-        <source>Debug</source>
-        <translation>Debug</translation>
-    </message>
-    <message>
-        <source>Release</source>
-        <translation>Release</translation>
+        <source> (Remote)</source>
+        <translation> (Zdalny)</translation>
     </message>
 </context>
 <context>
@@ -21034,6 +20959,10 @@ Uwaga: może to spowodować usunięcie lokalnego pliku.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Start &apos;%1&apos; and break at function &apos;main()&apos;</source>
+        <translation>Rozpocznij &quot;%1&quot; i zatrzymaj na funkcji &quot;main()&quot;</translation>
+    </message>
+    <message>
         <source>Save Debugger Log</source>
         <translation>Zachowaj log debuggera</translation>
     </message>
@@ -21749,6 +21678,10 @@ Ponowić próbę?</translation>
 <context>
     <name>ProjectExplorer::Internal::MsvcToolChainConfigWidget</name>
     <message>
+        <source>Initialization:</source>
+        <translation>Inicjalizacja:</translation>
+    </message>
+    <message>
         <source>The CDB debugger could not be found in %1</source>
         <translation>Nie można odnaleźć debuggera CDB w %1</translation>
     </message>
@@ -23232,6 +23165,10 @@ w instrukcjach warunkowych</translation>
         <source>Build All</source>
         <translation>Zbuduj wszystko</translation>
     </message>
+    <message>
+        <source>Tool Chain:</source>
+        <translation>Zestaw narzędzi:</translation>
+    </message>
 </context>
 <context>
     <name>QtSupport::Internal::QtVersionInfo</name>
@@ -23274,13 +23211,13 @@ w instrukcjach warunkowych</translation>
 <context>
     <name>LinuxDeviceFactorySelectionDialog</name>
     <message>
-        <source>Available wizards:</source>
-        <translation>Dostępne kreatory:</translation>
-    </message>
-    <message>
         <source>Device Configuration Wizard Selection</source>
         <translation>Wybór kreatora konfiguracji urządzenia</translation>
     </message>
+    <message>
+        <source>Available device types:</source>
+        <translation>Dostępne typy urządzeń:</translation>
+    </message>
 </context>
 <context>
     <name>MaemoDeployConfigurationWidget</name>
@@ -23318,37 +23255,6 @@ w instrukcjach warunkowych</translation>
     </message>
 </context>
 <context>
-    <name>MaemoDeviceConfigWizardLoginDataPage</name>
-    <message>
-        <source>WizardPage</source>
-        <translation>StronaKreatora</translation>
-    </message>
-    <message>
-        <source>User name:</source>
-        <translation>Nazwa użytkownika:</translation>
-    </message>
-    <message>
-        <source>Authentication type:</source>
-        <translation>Typ autoryzacji:</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation>Hasło</translation>
-    </message>
-    <message>
-        <source>Key</source>
-        <translation>Klucz</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Hasło:</translation>
-    </message>
-    <message>
-        <source>Private key:</source>
-        <translation>Klucz prywatny:</translation>
-    </message>
-</context>
-<context>
     <name>TextEditor::TabPreferencesWidget</name>
     <message>
         <source>Form</source>
@@ -23487,82 +23393,46 @@ Wpływa na wcięcia przeniesionych linii.
     </message>
 </context>
 <context>
-    <name>Valgrind::Internal::CallgrindConfigWidget</name>
-    <message>
-        <source>Profiling Options</source>
-        <translation>Opcje profilowania</translation>
-    </message>
-    <message>
-        <source>Result view: Show events with inclusive costs higher than:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%</source>
-        <translation>%</translation>
-    </message>
-    <message>
-        <source>Show additional information for events in tooltips</source>
-        <translation>Pokazuj dodatkowe informacje w podpowiedziach</translation>
-    </message>
-    <message>
-        <source>Enable cache simulation</source>
-        <translation>Włącz symulację cache</translation>
-    </message>
+    <name>Valgrind::Internal::SuppressionDialog</name>
     <message>
-        <source>Enable branch prediction simulation</source>
-        <translation type="unfinished"></translation>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
     </message>
     <message>
-        <source>Collect system call time</source>
-        <translation>Pokazuj czas systemowy</translation>
+        <source>Suppression File:</source>
+        <translation type="unfinished">Plik tłumienia:</translation>
     </message>
     <message>
-        <source>Collect global bus events</source>
-        <translation type="unfinished"></translation>
+        <source>Suppression:</source>
+        <translation type="unfinished">Tłumienie:</translation>
     </message>
     <message>
-        <source>Visualisation: Show events with inclusive costs higher than:</source>
-        <translation type="unfinished"></translation>
+        <source>Select Suppression File</source>
+        <translation type="unfinished">Wybierz plik tłumienia</translation>
     </message>
     <message>
-        <source>Limits the amount of results the profiler gives you. A lower limit will likely increase performance.</source>
-        <translation type="unfinished"></translation>
+        <source>Save Suppression</source>
+        <translation type="unfinished">Zachowaj tłumienie</translation>
     </message>
+</context>
+<context>
+    <name>Valgrind::Internal::ValgrindConfigWidget</name>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
-&lt;p&gt;Does full cache simulation.&lt;/p&gt;
-&lt;p&gt;By default, only instruction read accesses will be counted (&quot;Ir&quot;).&lt;/p&gt;
-&lt;p&gt;
-With cache simulation, further event counters are enabled:
-&lt;ul&gt;&lt;li&gt;Cache misses on instruction reads (&quot;I1mr&quot;/&quot;I2mr&quot;)&lt;/li&gt;
-&lt;li&gt;Data read accesses (&quot;Dr&quot;) and related cache misses (&quot;D1mr&quot;/&quot;D2mr&quot;)&lt;/li&gt;
-&lt;li&gt;Data write accesses (&quot;Dw&quot;) and related cache misses (&quot;D1mw&quot;/&quot;D2mw&quot;)&lt;/li&gt;&lt;/ul&gt;
-&lt;/p&gt;
-
-&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <source>Generic Settings</source>
+        <translation>Ustawienia ogólne</translation>
     </message>
     <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
-&lt;p&gt;Do branch prediction simulation.&lt;/p&gt;
-&lt;p&gt;Further event counters are enabled: &lt;/p&gt;
-&lt;ul&gt;&lt;li&gt;Number of executed conditional branches and related predictor misses (
-&quot;Bc&quot;/&quot;Bcm&quot;)&lt;/li&gt;
-&lt;li&gt;Executed indirect jumps and related misses of the jump address predictor (
-&quot;Bi&quot;/&quot;Bim&quot;)&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <source>Valgrind executable:</source>
+        <translation>Plik wykonywalny valgrind:</translation>
     </message>
     <message>
-        <source>Collect information for system call times.</source>
-        <translation type="unfinished"></translation>
+        <source>Valgrind Command</source>
+        <translation>Komenda valgrind</translation>
     </message>
     <message>
-        <source>Collect the number of global bus events that are executed. The event type &quot;Ge&quot; is used for these events.</source>
-        <translation type="unfinished"></translation>
+        <source>Valgrind Suppression File (*.supp);;All Files (*)</source>
+        <translation type="unfinished">Plik tłumienia valgrind&apos;a (*.supp);;Wszystkie pliki (*)</translation>
     </message>
-</context>
-<context>
-    <name>Valgrind::Internal::MemcheckConfigWidget</name>
     <message>
         <source>Memory Analysis Options</source>
         <translation>Opcje analizatora pamięci</translation>
@@ -23588,46 +23458,76 @@ With cache simulation, further event counters are enabled:
         <translation>Śledź źródła niezainicjalizowanej pamięci</translation>
     </message>
     <message>
-        <source>Valgrind Suppression File (*.supp);;All Files (*)</source>
-        <translation type="unfinished">Plik tłumienia valgrind&apos;a (*.supp);;Wszystkie pliki (*)</translation>
+        <source>Profiling Options</source>
+        <translation>Opcje profilowania</translation>
     </message>
-</context>
-<context>
-    <name>Valgrind::Internal::SuppressionDialog</name>
     <message>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
+        <source>Limits the amount of results the profiler gives you. A lower limit will likely increase performance.</source>
+        <translation>Ogranicza liczbę rezultatów dostarczanych przez profilera. Niższy limit zwiększa wydajność.</translation>
     </message>
     <message>
-        <source>Suppression File:</source>
-        <translation type="unfinished">Plik tłumienia:</translation>
+        <source>Result view: Minimum event cost:</source>
+        <translation>Widok z wynikami: Minimalny koszt zdarzeń:</translation>
     </message>
     <message>
-        <source>Suppression:</source>
-        <translation type="unfinished">Tłumienie:</translation>
+        <source>%</source>
+        <translation>%</translation>
     </message>
     <message>
-        <source>Select Suppression File</source>
-        <translation type="unfinished">Wybierz plik tłumienia</translation>
+        <source>Show additional information for events in tooltips</source>
+        <translation>Pokazuj dodatkowe informacje o zdarzeniach w podpowiedziach</translation>
     </message>
     <message>
-        <source>Save Suppression</source>
-        <translation type="unfinished">Zachowaj tłumienie</translation>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
+&lt;p&gt;Does full cache simulation.&lt;/p&gt;
+&lt;p&gt;By default, only instruction read accesses will be counted (&quot;Ir&quot;).&lt;/p&gt;
+&lt;p&gt;
+With cache simulation, further event counters are enabled:
+&lt;ul&gt;&lt;li&gt;Cache misses on instruction reads (&quot;I1mr&quot;/&quot;I2mr&quot;)&lt;/li&gt;
+&lt;li&gt;Data read accesses (&quot;Dr&quot;) and related cache misses (&quot;D1mr&quot;/&quot;D2mr&quot;)&lt;/li&gt;
+&lt;li&gt;Data write accesses (&quot;Dw&quot;) and related cache misses (&quot;D1mw&quot;/&quot;D2mw&quot;)&lt;/li&gt;&lt;/ul&gt;
+&lt;/p&gt;
+
+&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Valgrind::Internal::ValgrindConfigWidget</name>
     <message>
-        <source>Generic Settings</source>
-        <translation>Ustawienia ogólne</translation>
+        <source>Enable cache simulation</source>
+        <translation>Włącz symulację cache</translation>
     </message>
     <message>
-        <source>Valgrind executable:</source>
-        <translation>Plik wykonywalny valgrind:</translation>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;
+&lt;p&gt;Do branch prediction simulation.&lt;/p&gt;
+&lt;p&gt;Further event counters are enabled: &lt;/p&gt;
+&lt;ul&gt;&lt;li&gt;Number of executed conditional branches and related predictor misses (
+&quot;Bc&quot;/&quot;Bcm&quot;)&lt;/li&gt;
+&lt;li&gt;Executed indirect jumps and related misses of the jump address predictor (
+&quot;Bi&quot;/&quot;Bim&quot;)&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Valgrind Command</source>
-        <translation>Komenda valgrind</translation>
+        <source>Enable branch prediction simulation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Collect information for system call times.</source>
+        <translation>Gromadzi informacje o czasie systemowym.</translation>
+    </message>
+    <message>
+        <source>Collect system call time</source>
+        <translation>Pokazuj czas systemowy</translation>
+    </message>
+    <message>
+        <source>Collect the number of global bus events that are executed. The event type &quot;Ge&quot; is used for these events.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Collect global bus events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Visualisation: Minimum event cost:</source>
+        <translation>Wizualizacja: Minimalny koszt zdarzeń:</translation>
     </message>
 </context>
 <context>
@@ -23836,18 +23736,6 @@ With cache simulation, further event counters are enabled:
         <translation>Bufor cache&apos;a</translation>
     </message>
     <message>
-        <source>Cell height</source>
-        <translation>Wysokość komórki</translation>
-    </message>
-    <message>
-        <source>Cell width</source>
-        <translation>Szerokość komórki</translation>
-    </message>
-    <message>
-        <source>Flow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Navigation wraps</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24037,6 +23925,30 @@ With cache simulation, further event counters are enabled:
 <context>
     <name>Utils::FileUtils</name>
     <message>
+        <source>Refusing to remove root directory.</source>
+        <translation>Odmowa usunięcia katalogu głównego.</translation>
+    </message>
+    <message>
+        <source>Refusing to remove your home directory.</source>
+        <translation>Odmowa usunięcia katalogu domowego.</translation>
+    </message>
+    <message>
+        <source>Failed to remove directory &apos;%1&apos;.</source>
+        <translation>Nie można usunąć katalogu &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>Failed to remove file &apos;%1&apos;.</source>
+        <translation>Nie można usunąć pliku &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>Failed to create directory &apos;%1&apos;.</source>
+        <translation>Nie można utworzyć katalogu &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>Could not copy file &apos;%1&apos; to &apos;%2&apos;.</source>
+        <translation>Nie można skopiować pliku &quot;%1&quot; do &quot;%2&quot;.</translation>
+    </message>
+    <message>
         <source>Cannot open %1 for reading: %2</source>
         <translation>Nie można otworzyć %1 do odczytu: %2</translation>
     </message>
@@ -24069,11 +23981,11 @@ With cache simulation, further event counters are enabled:
     <name>Valgrind::Callgrind::CallModel</name>
     <message>
         <source>Callee</source>
-        <translation>Zawołany</translation>
+        <translation>Zawołana</translation>
     </message>
     <message>
         <source>Caller</source>
-        <translation>Wołający</translation>
+        <translation>Wołająca</translation>
     </message>
     <message>
         <source>Cost</source>
@@ -24092,7 +24004,7 @@ With cache simulation, further event counters are enabled:
     </message>
     <message>
         <source>Dumping profile data...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zrzucanie danych profilera...</translation>
     </message>
     <message>
         <source>Resetting event counters...</source>
@@ -24100,11 +24012,11 @@ With cache simulation, further event counters are enabled:
     </message>
     <message>
         <source>Pausing instrumentation...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zatrzymywanie instrumentalizacji...</translation>
     </message>
     <message>
         <source>Unpausing instrumentation...</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontynuowanie instrumentalizacji...</translation>
     </message>
     <message>
         <source>Callgrind dumped profiling info</source>
@@ -24116,7 +24028,7 @@ With cache simulation, further event counters are enabled:
     </message>
     <message>
         <source>Downloading remote profile data...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ściąganie zdalnych danych profilera...</translation>
     </message>
 </context>
 <context>
@@ -24147,7 +24059,7 @@ With cache simulation, further event counters are enabled:
     </message>
     <message>
         <source>Events</source>
-        <translation type="unfinished"></translation>
+        <translation>Zdarzenia</translation>
     </message>
     <message>
         <source>Self costs</source>
@@ -24272,7 +24184,7 @@ With cache simulation, further event counters are enabled:
     <name>Valgrind::Callgrind::CallgrindRunner</name>
     <message>
         <source>Parsing Profile Data...</source>
-        <translation type="unfinished"></translation>
+        <translation>Parsowanie danych profilera...</translation>
     </message>
 </context>
 <context>
@@ -24502,6 +24414,10 @@ Czy chcesz je nadpisać?</translation>
         <translation>Dołącz debugger do tego procesu</translation>
     </message>
     <message>
+        <source>Attach debugger to %1</source>
+        <translation>Dołącz debugger do %1</translation>
+    </message>
+    <message>
         <source>Application Output</source>
         <translation>Komunikaty aplikacji</translation>
     </message>
@@ -24554,6 +24470,14 @@ Czy chcesz je nadpisać?</translation>
 <context>
     <name>QmlDesigner::NodeInstanceServerProxy</name>
     <message>
+        <source>Cannot Start QML Puppet Executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The executable of the QML Puppet process (%1) cannot be started. Please check your installation. QML Puppet is a process which runs in the background to render the items.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Cannot Find QML Puppet Executable</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24599,6 +24523,16 @@ Czy chcesz je nadpisać?</translation>
 <context>
     <name>QmlProfiler::Internal::QmlProfilerEngine</name>
     <message>
+        <source>No executable file to launch.</source>
+        <translation>Brak pliku do uruchomienia.</translation>
+    </message>
+    <message>
+        <source>Application finished before loading profiled data.
+ Please use the stop button instead.</source>
+        <translation>Aplikacja zakończona przed załadowaniem danych profilera.
+ Zamiast tego użyj przycisku stop.</translation>
+    </message>
+    <message>
         <source>The port seems to be in use.</source>
         <extracomment>Error message shown after &apos;Could not connect ... debugger:&quot;</extracomment>
         <translation>Port prawdopodobnie zajęty.</translation>
@@ -24619,55 +24553,24 @@ Czy chcesz je nadpisać?</translation>
         <translation>Nie można podłączyć się do wewnątrzprocesowego debuggera QML:
 %1</translation>
     </message>
-</context>
-<context>
-    <name>QmlProfiler::Internal::QmlProfilerSummaryView</name>
-    <message>
-        <source>Location</source>
-        <translation>Położenie</translation>
-    </message>
     <message>
-        <source>Time in Percent</source>
-        <translation>Procentowy czas</translation>
-    </message>
-    <message>
-        <source>Total Time</source>
-        <translation>Czas całkowity</translation>
-    </message>
-    <message>
-        <source>Calls</source>
-        <translation>Wywołania</translation>
-    </message>
-    <message>
-        <source>Time per Call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Longest Time</source>
-        <translation>Najdłuższy czas</translation>
-    </message>
-    <message>
-        <source>Shortest Time</source>
-        <translation>Najkrótszy czas</translation>
+        <source>QML Profiler</source>
+        <translation>Profiler QML</translation>
     </message>
 </context>
 <context>
     <name>QmlProfiler::Internal::QmlProfilerTool</name>
     <message>
         <source>QML Profiler</source>
-        <translation type="unfinished"></translation>
+        <translation>Profiler QML</translation>
     </message>
     <message>
         <source>The QML Profiler can be used to find performance bottlenecks in applications using QML.</source>
-        <translation type="unfinished"></translation>
+        <translation>Profiler QML może być używany do znajdowania wąskich gardeł w wydajności aplikacji QML.</translation>
     </message>
     <message>
-        <source>Attach...</source>
-        <translation>Dołącz...</translation>
-    </message>
-    <message>
-        <source>Bindings</source>
-        <translation type="unfinished"></translation>
+        <source>Events</source>
+        <translation>Zdarzenia</translation>
     </message>
     <message>
         <source>Timeline</source>
@@ -24682,23 +24585,24 @@ Czy chcesz je nadpisać?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Discard data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Elapsed:      0 s</source>
         <translation>Upłynęłó:      0 s</translation>
     </message>
     <message>
-        <source>Elapsed: %1 s</source>
-        <translation>Upłynęło: %1 s</translation>
+        <source>Disable profiling</source>
+        <translation>Wyłącz profilowanie</translation>
     </message>
     <message>
-        <source>Detach</source>
-        <translation>Odłącz</translation>
+        <source>Enable profiling</source>
+        <translation>Włącz profilowanie</translation>
     </message>
-</context>
-<context>
-    <name>QmlProfiler::Internal::QmlProjectAnalyzerRunControlFactory</name>
     <message>
-        <source>QML Profiler</source>
-        <translation type="unfinished"></translation>
+        <source>Elapsed: %1 s</source>
+        <translation>Upłynęło: %1 s</translation>
     </message>
 </context>
 <context>
@@ -24720,27 +24624,7 @@ Czy chcesz je nadpisać?</translation>
     <name>QmlProjectManager::Internal::QmlProjectRunControlFactory</name>
     <message>
         <source>Run</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open Qt4 Options</source>
-        <translation>Otwórz ustawienia Qt4</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Anuluj</translation>
-    </message>
-    <message>
-        <source>QML Observer Missing</source>
-        <translation>Brak QML Observera</translation>
-    </message>
-    <message>
-        <source>QML Observer could not be found.</source>
-        <translation>Nie można odnaleźć QML Observera.</translation>
-    </message>
-    <message>
-        <source>QML Observer is used to offer debugging features for QML applications, such as interactive debugging and inspection tools. It must be compiled for each used Qt version separately. On the Qt4 options page, select the current Qt installation and click Rebuild.</source>
-        <translation>QML Observer umożliwia interaktywne debugowanie aplikacji QML. Aplikacja musi być skompilowana dla każdej wersji Qt. W tym celu wybierz bieżącą instalację Qt w ustawieniach Qt4 i kliknij Przebuduj.</translation>
+        <translation type="unfinished">Uruchom</translation>
     </message>
 </context>
 <context>
@@ -25349,7 +25233,7 @@ Czy uruchomiłeś Qemu?</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1 using device&lt;/b&gt;: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1 używając urządzenia&lt;/b&gt;: %2</translation>
     </message>
 </context>
 <context>
@@ -25375,13 +25259,6 @@ Czy uruchomiłeś Qemu?</translation>
     </message>
 </context>
 <context>
-    <name>RemoteLinux::Internal::MaemoDeviceConfigWizardLoginDataPage</name>
-    <message>
-        <source>Login Data</source>
-        <translation>Dane logowania</translation>
-    </message>
-</context>
-<context>
     <name>RemoteLinux::Internal::MaemoDeviceConfigWizardPreviousKeySetupCheckPage</name>
     <message>
         <source>Device Status Check</source>
@@ -25550,22 +25427,6 @@ Czy urządzenie jest podłączone i czy zostało skonfigurowane połączenie sie
         <translation>Mad Developer</translation>
     </message>
     <message>
-        <source>Failed to remove directory &apos;%1&apos;.</source>
-        <translation>Nie można usunąć katalogu &quot;%1&quot;.</translation>
-    </message>
-    <message>
-        <source>Failed to remove file &apos;%1&apos;.</source>
-        <translation>Nie można usunąć pliku &quot;%1&quot;.</translation>
-    </message>
-    <message>
-        <source>Failed to create directory &apos;%1&apos;.</source>
-        <translation>Nie można utworzyć katalogu &quot;%1&quot;.</translation>
-    </message>
-    <message>
-        <source>Could not copy file &apos;%1&apos; to &apos;%2&apos;.</source>
-        <translation>Nie można skopiować pliku &quot;%1&quot; do &quot;%2&quot;.</translation>
-    </message>
-    <message>
         <source>Unknown OS</source>
         <translation>Nieznany OS</translation>
     </message>
@@ -25677,146 +25538,11 @@ Proces jest kontynuowany.</translation>
     </message>
 </context>
 <context>
-    <name>RemoteLinux::Internal::AbstractMaemoPackageCreationStep</name>
-    <message>
-        <source>Package up to date.</source>
-        <translation>Pakiet aktualny.</translation>
-    </message>
-    <message>
-        <source>Creating package file ...</source>
-        <translation>Tworzenie pliku pakietu...</translation>
-    </message>
-    <message>
-        <source>Package created.</source>
-        <translation>Utworzono pakiet.</translation>
-    </message>
-    <message>
-        <source>Packaging failed.</source>
-        <translation>Błąd pakowania.</translation>
-    </message>
-    <message>
-        <source>Packaging error: No Qt version.</source>
-        <translation>Błąd pakowania: Brak wersji Qt.</translation>
-    </message>
-    <message>
-        <source>Package Creation: Running command &apos;%1&apos;.</source>
-        <translation>Tworzenie pakietu: Uruchamianie komendy &quot;%1&quot;.</translation>
-    </message>
-    <message>
-        <source>Packaging error: Could not start command &apos;%1&apos;. Reason: %2</source>
-        <translation>Błąd pakowania: Nie można uruchomić komendy &quot;%1&quot;. Powód: %2</translation>
-    </message>
-    <message>
-        <source>Packaging Error: Command &apos;%1&apos; failed.</source>
-        <translation>Błąd pakowania: Komenda &quot;%1&quot; zakończona błędem.</translation>
-    </message>
-    <message>
-        <source> Reason: %1</source>
-        <translation> Powód: %1</translation>
-    </message>
-    <message>
-        <source>Exit code: %1</source>
-        <translation>Kod wyjściowy: %1</translation>
-    </message>
-</context>
-<context>
-    <name>RemoteLinux::Internal::MaemoDebianPackageCreationStep</name>
-    <message>
-        <source>Create Debian Package</source>
-        <translation>Utwórz pakiet Debian</translation>
-    </message>
-    <message>
-        <source>Packaging failed.</source>
-        <translation>Błąd pakowania.</translation>
-    </message>
-    <message>
-        <source>Could not move package files from %1 to %2.</source>
-        <translation>Nie można przenieść plików pakietu z %1 do %2.</translation>
-    </message>
-    <message>
-        <source>Your project name contains characters not allowed in Debian packages.
-They must only use lower-case letters, numbers, &apos;-&apos;, &apos;+&apos; and &apos;.&apos;.
-We will try to work around that, but you may experience problems.</source>
-        <translation>Nazwa projektu zawiera znaki, które są niedozwolone w pakietach Debiana.
-Dozwolonymi znakami są tylko małe litery, liczby, &apos;-&apos;, &apos;+&apos; oraz &apos;.&apos;.
-Przy obecnej nazwie możesz spodziewać się problemów.</translation>
-    </message>
-    <message>
-        <source>Packaging failed: Foreign debian directory detected.</source>
-        <translation>Błąd podczas tworzenia pakietu: wykryto obcy katalog Debiana.</translation>
-    </message>
-    <message>
-        <source>You are not using a shadow build and there is a debian directory in your project root (&apos;%1&apos;). Qt Creator will not overwrite that directory. Please remove it or use the shadow build feature.</source>
-        <translation>Kompilacja w innym miejscu nie została użyta, a w projekcie występuje katalog debian (&quot;%1&quot;). Ten katalog nie zostanie nadpisany. Usuń go lub skompiluj projekt w innym miejscu.</translation>
-    </message>
-    <message>
-        <source>Could not remove directory &apos;%1&apos;: %2</source>
-        <translation>Nie można usunąć katalogu &quot;%1&quot;: %2</translation>
-    </message>
-    <message>
-        <source>Could not create Debian directory &apos;%1&apos;.</source>
-        <translation>Nie można utworzyć katalogu Debian w &quot;%1&quot;.</translation>
-    </message>
-    <message>
-        <source>Could not copy file &apos;%1&apos; to &apos;%2&apos;</source>
-        <translation>Nie można skopiować pliku &quot;%1&quot; do &quot;%2&quot;</translation>
-    </message>
-    <message>
-        <source>Error: Could not create file &apos;%1&apos;.</source>
-        <translation>Błąd: Nie można utworzyć pliku &quot;%1&quot;.</translation>
-    </message>
-</context>
-<context>
-    <name>RemoteLinux::Internal::MaemoRpmPackageCreationStep</name>
-    <message>
-        <source>Create RPM Package</source>
-        <translation>Utwórz pakiet RPM</translation>
-    </message>
-    <message>
-        <source>Packaging failed.</source>
-        <translation>Błąd pakowania.</translation>
-    </message>
-    <message>
-        <source>Could not move package file from %1 to %2.</source>
-        <translation>Nie można przenieść pliku pakietu z %1 do %2.</translation>
-    </message>
-</context>
-<context>
-    <name>RemoteLinux::Internal::CreateTarStepWidget</name>
-    <message>
-        <source>Create tarball:</source>
-        <translation>Utwórz tarball:</translation>
-    </message>
-</context>
-<context>
-    <name>RemoteLinux::Internal::MaemoTarPackageCreationStep</name>
-    <message>
-        <source>Create tarball</source>
-        <translation>Utwórz tarball</translation>
-    </message>
-    <message>
-        <source>Error: tar file %1 cannot be opened (%2).</source>
-        <translation>Błąd: nie można otworzyć pliku tar %1 (%2).</translation>
-    </message>
-    <message>
-        <source>Error writing tar file &apos;%1&apos;: %2.</source>
-        <translation>Błąd zapisu pliku tar &quot;%1&quot;: %2.</translation>
-    </message>
-    <message>
-        <source>Error reading file &apos;%1&apos;: %2.</source>
-        <translation>Błąd odczytu pliku &quot;%1&quot;: %2.</translation>
-    </message>
-    <message>
-        <source>Cannot add file &apos;%1&apos; to tar-archive: path too long.</source>
-        <translation>Nie można dodać pliku &quot;%1&quot; do archiwum tar: zbyt długa ścieżka.</translation>
-    </message>
+    <name>RemoteLinux::Internal::MaemoPackageCreationWidget</name>
     <message>
-        <source>Error writing tar file &apos;%1&apos;: %2</source>
-        <translation>Błąd zapisu pliku tar &quot;%1&quot;: %2</translation>
+        <source>Size should be %1x%2 pixels</source>
+        <translation>Rozmiar powinien wynosić %1x%2 w pikselach</translation>
     </message>
-</context>
-<context>
-    <name>RemoteLinux::Internal::MaemoPackageCreationWidget</name>
     <message>
         <source>No Version Available.</source>
         <translation>Brak dostępnej wersji.</translation>
@@ -26125,8 +25851,8 @@ Przy obecnej nazwie możesz spodziewać się problemów.</translation>
 <context>
     <name>RemoteLinux::Internal::MaemoQemuManager</name>
     <message>
-        <source>Start Maemo Emulator</source>
-        <translation>Uruchom emulator Maemo</translation>
+        <source>Start MeeGo Emulator</source>
+        <translation>Rozpocznij emulator MeeGo</translation>
     </message>
     <message>
         <source>Qemu has been shut down, because you removed the corresponding Qt version.</source>
@@ -26145,8 +25871,8 @@ Przy obecnej nazwie możesz spodziewać się problemów.</translation>
         <translation>Nie można uruchomić Qemu: %1</translation>
     </message>
     <message>
-        <source>Stop Maemo Emulator</source>
-        <translation>Zatrzymaj emulator Maemo</translation>
+        <source>Stop MeeGo Emulator</source>
+        <translation>Zatrzymaj emulator MeeGo</translation>
     </message>
 </context>
 <context>
@@ -26358,8 +26084,8 @@ Zawartość zdalnego stderr: %1</translation>
 <context>
     <name>RemoteLinux::Internal::MaemoQemuSettingsPage</name>
     <message>
-        <source>Maemo Qemu Settings</source>
-        <translation>Ustawienia Qemu Maemo</translation>
+        <source>MeeGo Qemu Settings</source>
+        <translation>Ustawienia Qemu MeeGo</translation>
     </message>
 </context>
 <context>
@@ -26441,21 +26167,14 @@ Zawartość zdalnego stderr: %1</translation>
     <name>RemoteLinux::Internal::MaemoUploadAndInstallDpkgPackageStep</name>
     <message>
         <source>Deploy Debian package via SFTP upload</source>
-        <translation type="unfinished">Zainstaluj pakiet Debian poprzez SFTP</translation>
+        <translation>Zainstaluj pakiet Debian poprzez SFTP</translation>
     </message>
 </context>
 <context>
     <name>RemoteLinux::Internal::MaemoUploadAndInstallRpmPackageStep</name>
     <message>
         <source>Deploy RPM package via SFTP upload</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RemoteLinux::Internal::MaemoUploadAndInstallTarPackageStep</name>
-    <message>
-        <source>Deploy tar package via SFTP upload</source>
-        <translation type="unfinished"></translation>
+        <translation>Zainstaluj pakiet RPM poprzez SFTP</translation>
     </message>
 </context>
 <context>
@@ -26486,23 +26205,23 @@ Zawartość zdalnego wyjścia z błędami: %1</translation>
 <context>
     <name>RemoteLinux::Internal::Qt4MaemoDeployConfigurationFactory</name>
     <message>
-        <source>Copy files to Maemo5 device</source>
+        <source>Copy Files to Maemo5 Device</source>
         <translation>Kopiowanie plików do urządzenia Maemo5</translation>
     </message>
     <message>
-        <source>Build Debian package and install to Maemo5 device</source>
+        <source>Build Debian Package and Install to Maemo5 Device</source>
         <translation>Budowanie pakietu Debian i instalowanie na urządzeniu Maemo5</translation>
     </message>
     <message>
-        <source>Build Debian package and install to Harmattan device</source>
+        <source>Build Debian Package and Install to Harmattan Device</source>
         <translation>Budowanie pakietu Debian i instalowanie na urządzeniu Harmattan</translation>
     </message>
     <message>
-        <source>Build RPM package and install to Meego device</source>
+        <source>Build RPM Package and Install to MeeGo Device</source>
         <translation>Budowanie pakietu RPM i instalowanie na urządzeniu Meego</translation>
     </message>
     <message>
-        <source>Build tarball and install to Linux host</source>
+        <source>Build Tarball and Install to Linux Host</source>
         <translation>Budowanie tarballa i instalowanie na hoście linuksowym</translation>
     </message>
 </context>
@@ -26521,24 +26240,24 @@ Zawartość zdalnego wyjścia z błędami: %1</translation>
         <translation>Czy chcesz usunąć pliki pakietów powiązanych z produktem docelowym &quot;%1&quot;?</translation>
     </message>
     <message>
-        <source>Error creating Maemo packaging directory &apos;%1&apos;.</source>
-        <translation>Błąd tworzenia katalogu pakietu Maemo &quot;%1&quot;.</translation>
-    </message>
-    <message>
-        <source>Add Packaging Files to Project</source>
-        <translation>Dodaj pliki pakietowe do projektu</translation>
+        <source>Error creating packaging directory &apos;%1&apos;.</source>
+        <translation>Błąd tworzenia katalogu pakietu &quot;%1&quot;.</translation>
     </message>
     <message>
-        <source>Qt Creator has set up the following files to enable packaging:
+        <source>&lt;html&gt;Qt Creator has set up the following files to enable packaging:
    %1
-Do you want to add them to the project?</source>
-        <translation>Qt Creator skonfigurował następujące pliki aby umożliwić tworzenie pakietów:
+Do you want to add them to the project?&lt;/html&gt;</source>
+        <translation>&lt;html&gt;Qt Creator skonfigurował następujące pliki aby umożliwić tworzenie pakietów:
    %1
-Czy chcesz dodać je do projektu?</translation>
+Czy chcesz dodać je do projektu?&lt;/html&gt;</translation>
     </message>
     <message>
-        <source>Error creating Maemo templates</source>
-        <translation>Błąd tworzenia szablonów Maemo</translation>
+        <source>Error creating MeeGo templates</source>
+        <translation>Błąd tworzenia szablonów MeeGo</translation>
+    </message>
+    <message>
+        <source>Add Packaging Files to Project</source>
+        <translation>Dodaj pliki pakietowe do projektu</translation>
     </message>
 </context>
 <context>
@@ -26675,21 +26394,14 @@ Czy chcesz dodać je do projektu?</translation>
     </message>
 </context>
 <context>
-    <name>Valgrind::Internal::AbstractCallgrindSettings</name>
-    <message>
-        <source>Profiling</source>
-        <translation>Profilowanie</translation>
-    </message>
-</context>
-<context>
     <name>Valgrind::Internal::CallgrindTool</name>
     <message>
-        <source>Valgrind Function Profile</source>
-        <translation type="unfinished"></translation>
+        <source>Valgrind Function Profiler</source>
+        <translation>Profiler funkcji Valgrind</translation>
     </message>
     <message>
         <source>Valgrind Profile uses the &quot;callgrind&quot; tool to record function calls when a program runs.</source>
-        <translation type="unfinished"></translation>
+        <translation>Profiler Valgrind używa narzędzia &quot;callgrind&quot; do zapamiętywania wywołań funkcji w trakcie działania programu.</translation>
     </message>
     <message>
         <source>Profile Costs of this Function and its Callees</source>
@@ -26716,27 +26428,27 @@ Czy chcesz dodać je do projektu?</translation>
     </message>
     <message>
         <source>Request the dumping of profile information. This will update the callgrind visualization.</source>
-        <translation type="unfinished"></translation>
+        <translation>Żąda zrzutu informacji i odświeża widok callgrinda.</translation>
     </message>
     <message>
         <source>Go back one step in history. This will select the previously selected item.</source>
-        <translation type="unfinished"></translation>
+        <translation>Przechodzi wstecz o jeden krok w historii. Spowoduje to zaznaczenie uprzednio wybranego elementu.</translation>
     </message>
     <message>
         <source>Reset all event counters.</source>
-        <translation type="unfinished"></translation>
+        <translation>Resetuje wszystkie liczniki zdarzeń.</translation>
     </message>
     <message>
         <source>Pause event logging. No events are counted which will speed up program execution during profiling.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zatrzymuje logowanie zdarzeń. Żadne zdarzenia nie będą zliczane, co spowoduje przyśpieszenie wykonywania programu podczas profilowania.</translation>
     </message>
     <message>
         <source>Go forward one step in history.</source>
-        <translation>Przejdź naprzód o jeden krok w historii.</translation>
+        <translation>Przechodzi naprzód o jeden krok w historii.</translation>
     </message>
     <message>
         <source>Selects which events from the profiling data are shown and visualized.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybiera które zdarzenia, z profilowanych danych, zostaną zwizualizowane.</translation>
     </message>
     <message>
         <source>Absolute Costs</source>
@@ -26854,13 +26566,6 @@ Czy chcesz dodać je do projektu?</translation>
     </message>
 </context>
 <context>
-    <name>Valgrind::Internal::AbstractMemcheckSettings</name>
-    <message>
-        <source>Memory Analysis</source>
-        <translation>Analiza pamięci</translation>
-    </message>
-</context>
-<context>
     <name>Valgrind::Internal::MemcheckTool</name>
     <message>
         <source>External Errors</source>
@@ -26887,10 +26592,6 @@ Czy chcesz dodać je do projektu?</translation>
         <translation>Niepoprawne wywołania &quot;free()&quot;</translation>
     </message>
     <message>
-        <source>Valgrind Analyze Memory</source>
-        <translation>Analiza pamięci Valgrinda</translation>
-    </message>
-    <message>
         <source>Valgrind Analyze Memory uses the &quot;memcheck&quot; tool to find memory leaks</source>
         <translation>Analiza pamięci Valgrinda używa narzędzia &quot;memcheck&quot; do znajdywania wycieków pamięci</translation>
     </message>
@@ -26915,6 +26616,10 @@ Czy chcesz dodać je do projektu?</translation>
         <translation type="unfinished">Te pliki tłumienia były użyte podczas ostatniego uruchomienia analizatora pamięci.</translation>
     </message>
     <message>
+        <source>Valgrind Memory Analyzer</source>
+        <translation>Analizator pamięci Valgrind</translation>
+    </message>
+    <message>
         <source>Error Filter</source>
         <translation>Filtr błędów</translation>
     </message>
@@ -26971,13 +26676,6 @@ Czy chcesz dodać je do projektu?</translation>
     </message>
 </context>
 <context>
-    <name>Valgrind::Internal::ValgrindSettings</name>
-    <message>
-        <source>Generic Settings</source>
-        <translation>Ustawienia ogólne</translation>
-    </message>
-</context>
-<context>
     <name>VCSBase::Internal::CommonSettingsWidget</name>
     <message>
         <source>Command used for reverting diff chunks</source>
@@ -27084,10 +26782,6 @@ Czy chcesz dodać je do projektu?</translation>
 <context>
     <name>QtQuickComponentSetOptionsPage</name>
     <message>
-        <source>Qt Quick Application Type</source>
-        <translation>Typ aplikacji Qt Quick</translation>
-    </message>
-    <message>
         <source>Built-in elements only (for all platforms)</source>
         <translation>Tylko wbudowane elementy (dla wszystkich platform)</translation>
     </message>
@@ -27107,19 +26801,25 @@ Czy chcesz dodać je do projektu?</translation>
         <source>The built-in elements in the QtQuick namespace allow you to write cross-platform applications with a custom look and feel.
 
 Requires Qt 4.7.1 or newer.</source>
-        <translation type="unfinished">Wbudowane elementy w przestrzeni nazw QtQuick umożliwiają pisanie przenośnych aplikacji z przystosowalnym </translation>
+        <translation>Wbudowane elementy w przestrzeni nazw QtQuick umożliwiają pisanie przenośnych aplikacji z przystosowalnym wyglądem.
+
+Wymaga Qt 4.7.1 lub nowszego.</translation>
     </message>
     <message>
         <source>The Qt Quick Components for Symbian are a set of ready-made components that are designed with specific native appearance for the Symbian platform.
 
 Requires Qt 4.7.3 or newer, and the component set installed for your Qt version.</source>
-        <translation type="unfinished"></translation>
+        <translation>Komponenty Qt Quick dla Symbiana to zestaw gotowych komponentów z natywnym wyglądem zaprojektowanych specjalnie dla Symbiana.
+
+Wymaga Qt 4.7.3 lub nowszego oraz zainstalowanego zestawu komponentów dla tej wersji.</translation>
     </message>
     <message>
         <source>The Qt Quick Components for Meego/Harmattan are a set of ready-made components that are designed with specific native appearance for the Meego/Harmattan platform.
 
 Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.</source>
-        <translation type="unfinished"></translation>
+        <translation>Komponenty Qt Quick dla Meego/Harmattan to zestaw gotowych komponentów z natywnym wyglądem zaprojektowanych specjalnie dla Meego/Harmattan.
+
+Wymaga Qt 4.7.4 lub nowszego oraz zainstalowanego zestawu komponentów dla tej wersji.</translation>
     </message>
     <message>
         <source>All files and directories that reside in the same directory as the main QML file are deployed. You can modify the contents of the directory any time before deploying.</source>
@@ -27141,14 +26841,6 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.
         <translation>Nazwa hosta lub adres IP urządzenia:</translation>
     </message>
     <message>
-        <source>User name:</source>
-        <translation>Nazwa użytkownika:</translation>
-    </message>
-    <message>
-        <source>Authentication type:</source>
-        <translation>Typ autoryzacji:</translation>
-    </message>
-    <message>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
@@ -27157,12 +26849,20 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.
         <translation>Klucz</translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Hasło:</translation>
+        <source>The user name to log into the device:</source>
+        <translation>Nazwa użytkownika urządzenia:</translation>
     </message>
     <message>
-        <source>Private key:</source>
-        <translation>Klucz prywatny:</translation>
+        <source>The authentication type:</source>
+        <translation>Typ autoryzacji:</translation>
+    </message>
+    <message>
+        <source>The user&apos;s password:</source>
+        <translation>Hasło użytkownika:</translation>
+    </message>
+    <message>
+        <source>The file containing the user&apos;s private key:</source>
+        <translation>Plik zawierający prywatny klucz użytkownika:</translation>
     </message>
 </context>
 <context>
@@ -27210,19 +26910,15 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.
         <translation>Pokaż przykłady i dema</translation>
     </message>
     <message>
-        <source>Filter by Tag</source>
-        <translation type="unfinished">Przefiltruj przez tag</translation>
-    </message>
-    <message>
-        <source>Tag Filter: %1</source>
-        <translation type="unfinished"></translation>
+        <source>Tag List</source>
+        <translation>Lista tagów</translation>
     </message>
 </context>
 <context>
     <name>FeaturedAndNewsListing</name>
     <message>
         <source>Featured News</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowiny</translation>
     </message>
 </context>
 <context>
@@ -27265,6 +26961,10 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.
         <translation>Ostatnio używane sesje</translation>
     </message>
     <message>
+        <source>%1 (last session)</source>
+        <translation>%1 (ostatnia sesja)</translation>
+    </message>
+    <message>
         <source>%1 (current session)</source>
         <translation>%1 (bieżąca sesja)</translation>
     </message>
@@ -27275,77 +26975,6 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.
         <source>Please choose a tag to filter for:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Clear</source>
-        <translation>Wyczyść</translation>
-    </message>
-</context>
-<context>
-    <name>Analyzer::AnalyzerManager::AnalyzerManagerPrivate</name>
-    <message>
-        <source>&amp;Analyze</source>
-        <translation>&amp;Analiza</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation>Uruchom</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Zatrzymaj</translation>
-    </message>
-    <message>
-        <source>Analyzer Toolbar</source>
-        <translation>Pasek narzędzi analizatora</translation>
-    </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;center&gt;&lt;i&gt;%1&lt;/i&gt; is still running. You have to quit the Analyzer before being able to run another instance.&lt;center/&gt;&lt;center&gt;Force it to quit?&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;center&gt;&lt;i&gt;%1&lt;/i&gt; jest wciąż uruchomiony. Należy zakończyć pracę analizatora przed uruchomieniem kolejnej instancji.&lt;center/&gt;&lt;center&gt;Wymusić zakończenie?&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>Analyzer Still Running</source>
-        <translation>Analizator wciąż uruchomiony</translation>
-    </message>
-    <message>
-        <source>Stop Active Run</source>
-        <translation>Zatrzymaj</translation>
-    </message>
-    <message>
-        <source>Keep Running</source>
-        <translation>Pozostaw uruchomionym</translation>
-    </message>
-    <message>
-        <source>Debug</source>
-        <translation>Debug</translation>
-    </message>
-    <message>
-        <source>Release</source>
-        <translation>Release</translation>
-    </message>
-    <message>
-        <source>Run %1 in %2 Mode?</source>
-        <translation>Uruchom %1 w trybie %2?</translation>
-    </message>
-    <message>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You are trying to run the tool &apos;%1&apos; on an application in %2 mode. The tool is designed to be used in %3 mode.&lt;/p&gt;&lt;p&gt;Do you want to continue and run it in %2 mode?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Próba uruchomienia narzędzia &quot;%1&quot; na aplikacji w trybie %2. Narzędzie nie jest zaprojektowane do użycia w trybie %3.&lt;/p&gt;&lt;p&gt;Czy chcesz kontynuować i uruchomić je w trybie %2?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&amp;Do not ask again</source>
-        <translation>&amp;Nie pytaj ponownie</translation>
-    </message>
-    <message>
-        <source> (Remote)</source>
-        <translation> (Zdalny)</translation>
-    </message>
-    <message>
-        <source>An analysis is still in progress.</source>
-        <translation>Nadal trwa analiza.</translation>
-    </message>
-    <message>
-        <source>No analyzer tool selected.</source>
-        <translation>Brak wybranego narzędzia analizy.</translation>
-    </message>
 </context>
 <context>
     <name>GenericProjectManager::Internal::FilesSelectionWizardPage</name>
@@ -27395,6 +27024,18 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.
 
 %1</translation>
     </message>
+    <message numerus="yes">
+        <source>Not showing %n files that are outside of the base directory.
+These files are preserved.</source>
+        <translation>
+            <numerusform>Ukryto %n plik który jest na zewnątrz katalogu bazowego.
+Ten plik jest zabezpieczony.</numerusform>
+            <numerusform>Ukryto %n pliki które są na zewnątrz katalogu bazowego.
+Te pliki są zabezpieczone.</numerusform>
+            <numerusform>Ukryto %n plików które są na zewnątrz katalogu bazowego.
+Te pliki są zabezpieczone.</numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>Git::Internal::BranchModel</name>
@@ -27422,15 +27063,15 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.
     <name>QmlDesigner::ModelNodeContextMenu</name>
     <message>
         <source>Selection</source>
-        <translation type="unfinished"></translation>
+        <translation>Selekcja</translation>
     </message>
     <message>
         <source>Select parent: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaznacz rodzica: %1</translation>
     </message>
     <message>
         <source>Select: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaznacz: %1</translation>
     </message>
     <message>
         <source>Stack (z)</source>
@@ -27438,11 +27079,11 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.
     </message>
     <message>
         <source>To Front</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Na wierzch</translation>
     </message>
     <message>
         <source>To Back</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Na spód</translation>
     </message>
     <message>
         <source>Raise</source>
@@ -27454,19 +27095,19 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.
     </message>
     <message>
         <source>Reset z property</source>
-        <translation type="unfinished"></translation>
+        <translation>Zresetuj właściwość &quot;z&quot;</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Edycja</translation>
     </message>
     <message>
         <source>Reset Position</source>
-        <translation type="unfinished"></translation>
+        <translation>Zresetuj pozycję</translation>
     </message>
     <message>
         <source>Reset Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Zresetuj rozmiar</translation>
     </message>
     <message>
         <source>Visibility</source>
@@ -27536,92 +27177,6 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.
     </message>
 </context>
 <context>
-    <name>QmlProfiler::Internal::QmlProfilerCalleeView</name>
-    <message>
-        <source>&lt;bytecode&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Source code not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation>Położenie</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <source>Details</source>
-        <translation>Szczegóły</translation>
-    </message>
-    <message>
-        <source>Paint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compile</source>
-        <translation type="unfinished">Kompilacja</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Binding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Signal</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QmlProfiler::Internal::QmlProfilerCallerView</name>
-    <message>
-        <source>&lt;bytecode&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Source code not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation>Położenie</translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <source>Details</source>
-        <translation>Szczegóły</translation>
-    </message>
-    <message>
-        <source>Paint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compile</source>
-        <translation type="unfinished">Kompilacja</translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Binding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Signal</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>QmlProfiler::Internal::RemoteLinuxQmlProfilerRunner</name>
     <message>
         <source>Not enough free ports on device for analyzing.
@@ -27659,6 +27214,10 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.
         <source>Select QML File</source>
         <translation>Wybierz plik QML</translation>
     </message>
+    <message>
+        <source>Qt Quick Application Type</source>
+        <translation>Typ aplikacji Qt Quick</translation>
+    </message>
 </context>
 <context>
     <name>QtSupport::Internal::GettingStartedWelcomePage</name>
@@ -27666,6 +27225,38 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.
         <source>Getting Started</source>
         <translation>Zaczynamy</translation>
     </message>
+    <message>
+        <source>Copy Project to writable Location?</source>
+        <translation>Skopiować projekt do miejsca zapisywalnego?</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The project you are about to open is located in the write-protected location:&lt;/p&gt;&lt;blockquote&gt;%1&lt;/blockquote&gt;&lt;p&gt;Please select a writable location below and click &quot;Copy Project and Open&quot; to open a modifiable copy of the project or click &quot;Keep Project and Open&quot; to open the project in location.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You will not be able to alter or compile your project in the current location.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Projekt, który masz zamiar załadować, znajduje się w miejscu zabezpieczonym przed zapisem:&lt;/p&gt;&lt;blockquote&gt;%1&lt;/blockquote&gt;&lt;p&gt;Proszę wybrać miejsce z prawami do zapisu i kliknąć &quot;Skopiuj projekt i otwórz&quot;, żeby załadować modyfikowalną kopię projektu lub kliknąć &quot;Zostaw projekt i otwórz&quot;, żeby załadować projekt z miejsca, gdzie się obecnie znajduje.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Uwaga:&lt;/b&gt; Nie będzie można zmienić lub skompilować projektu w bieżącej lokalizacji.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&amp;Location:</source>
+        <translation>&amp;Położenie:</translation>
+    </message>
+    <message>
+        <source>&amp;Copy Project and Open</source>
+        <translation>S&amp;kopiuj projekt i otwórz</translation>
+    </message>
+    <message>
+        <source>&amp;Keep Project and Open</source>
+        <translation>Po&amp;zostaw projekt i otwórz</translation>
+    </message>
+    <message>
+        <source>Cannot Use Location</source>
+        <translation>Nie można użyć położenia</translation>
+    </message>
+    <message>
+        <source>The specified location already exists. Please specify a valid location.</source>
+        <translation>Podane położenie już istnieje. Podaj poprawne położenie.</translation>
+    </message>
+    <message>
+        <source>Cannot Copy Project</source>
+        <translation>Nie można skopiować projektu</translation>
+    </message>
 </context>
 <context>
     <name>RemoteLinux::DeployableFilesPerProFile</name>
@@ -27728,7 +27319,8 @@ Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.
     <message>
         <source>The new device configuration will now be created.
 In addition, device connectivity will be tested.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zostanie teraz utworzona nowa konfiguracja urządzenia.
+Dodatkowo, przetestowane zostanie połączenie z urządzeniem.</translation>
     </message>
 </context>
 <context>
@@ -27945,4 +27537,386 @@ In addition, device connectivity will be tested.</source>
         <translation>Uruchom na zdalnym urządzeniu linuksowym</translation>
     </message>
 </context>
+<context>
+    <name>StatusDisplay</name>
+    <message>
+        <source>No QML events recorded</source>
+        <translation>Brak zarejestrowanych zdarzeń QML</translation>
+    </message>
+    <message>
+        <source>Profiling application</source>
+        <translation>Profilowanie aplikacji</translation>
+    </message>
+    <message>
+        <source>Loading data</source>
+        <translation>Ładowanie danych</translation>
+    </message>
+</context>
+<context>
+    <name>ExampleDelegate</name>
+    <message>
+        <source>Tags:</source>
+        <translation>Tagi:</translation>
+    </message>
+</context>
+<context>
+    <name>Analyzer::AnalyzerManagerPrivate</name>
+    <message>
+        <source>&amp;Analyze</source>
+        <translation>&amp;Analiza</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation>Uruchom</translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation>Zatrzymaj</translation>
+    </message>
+    <message>
+        <source>Analyzer Toolbar</source>
+        <translation>Pasek narzędzi analizatora</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;center&gt;&lt;i&gt;%1&lt;/i&gt; is still running. You have to quit the Analyzer before being able to run another instance.&lt;center/&gt;&lt;center&gt;Force it to quit?&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;center&gt;&lt;i&gt;%1&lt;/i&gt; jest wciąż uruchomiony. Należy zakończyć pracę analizatora przed uruchomieniem kolejnej instancji.&lt;center/&gt;&lt;center&gt;Wymusić zakończenie?&lt;/center&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>Analyzer Still Running</source>
+        <translation>Analizator wciąż uruchomiony</translation>
+    </message>
+    <message>
+        <source>Stop Active Run</source>
+        <translation>Zatrzymaj</translation>
+    </message>
+    <message>
+        <source>Keep Running</source>
+        <translation>Pozostaw uruchomionym</translation>
+    </message>
+    <message>
+        <source>Debug</source>
+        <translation>Debug</translation>
+    </message>
+    <message>
+        <source>Release</source>
+        <translation>Release</translation>
+    </message>
+    <message>
+        <source>Run %1 in %2 Mode?</source>
+        <translation>Uruchomić %1 w trybie %2?</translation>
+    </message>
+    <message>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;You are trying to run the tool &quot;%1&quot; on an application in %2 mode. The tool is designed to be used in %3 mode.&lt;/p&gt;&lt;p&gt;Do you want to continue and run it in %2 mode?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Próba uruchomienia narzędzia &quot;%1&quot; na aplikacji w trybie %2. Narzędzie nie jest zaprojektowane do użycia w trybie %3.&lt;/p&gt;&lt;p&gt;Czy chcesz kontynuować i uruchomić je w trybie %2?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <source>&amp;Do not ask again</source>
+        <translation>&amp;Nie pytaj ponownie</translation>
+    </message>
+    <message>
+        <source>An analysis is still in progress.</source>
+        <translation>Nadal trwa analiza.</translation>
+    </message>
+    <message>
+        <source>No analyzer tool selected.</source>
+        <translation>Brak wybranego narzędzia analizy.</translation>
+    </message>
+</context>
+<context>
+    <name>CodePaster::PasteBinDotComProtocol</name>
+    <message>
+        <source>&lt;Unknown&gt;</source>
+        <extracomment>Unknown user of paste.</extracomment>
+        <translation>&lt;Nieznany&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>QmlDesigner::TextToModelMerger error message</name>
+    <message>
+        <source>No import statements found</source>
+        <translation>Brak instrukcji importu</translation>
+    </message>
+</context>
+<context>
+    <name>QmlProfiler::Internal::QmlProfilerEventStatistics</name>
+    <message>
+        <source>Source code not available</source>
+        <translation>Kod źródłowy nie jest dostępny</translation>
+    </message>
+    <message>
+        <source>&lt;bytecode&gt;</source>
+        <translation>&lt;kod bajtowy&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>QmlProfiler::Internal::QmlProfilerEventsView</name>
+    <message>
+        <source>Location</source>
+        <translation>Położenie</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <source>Time in Percent</source>
+        <translation>Procentowy czas</translation>
+    </message>
+    <message>
+        <source>Total Time</source>
+        <translation>Czas całkowity</translation>
+    </message>
+    <message>
+        <source>Calls</source>
+        <translation>Wywołania</translation>
+    </message>
+    <message>
+        <source>Time per Call</source>
+        <translation>Średni czas wywołania</translation>
+    </message>
+    <message>
+        <source>Longest Time</source>
+        <translation>Najdłuższy czas</translation>
+    </message>
+    <message>
+        <source>Shortest Time</source>
+        <translation>Najkrótszy czas</translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation>Szczegóły</translation>
+    </message>
+    <message>
+        <source>Paint</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compile</source>
+        <translation type="unfinished">Kompilacja</translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Binding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QmlProfiler::Internal::QmlProfilerRunControlFactory</name>
+    <message>
+        <source>QML Profiler</source>
+        <translation>Profiler QML</translation>
+    </message>
+</context>
+<context>
+    <name>QmlProfiler::Internal::TraceWindow</name>
+    <message>
+        <source>Jump to previous event</source>
+        <translation>Skocz do poprzedniego zdarzenia</translation>
+    </message>
+    <message>
+        <source>Jump to next event</source>
+        <translation>Skocz do następnego zdarzenia</translation>
+    </message>
+    <message>
+        <source>Zoom in 10%</source>
+        <translation>Powiększ 10%</translation>
+    </message>
+    <message>
+        <source>Zoom out 10%</source>
+        <translation>Pomniejsz 10%</translation>
+    </message>
+</context>
+<context>
+    <name>QmlProjectManager::QmlProjectPlugin</name>
+    <message>
+        <source>Open Qt4 Options</source>
+        <translation>Otwórz ustawienia Qt4</translation>
+    </message>
+    <message>
+        <source>QML Observer Missing</source>
+        <translation>Brak QML Observera</translation>
+    </message>
+    <message>
+        <source>QML Observer could not be found.</source>
+        <translation>Nie można odnaleźć QML Observera.</translation>
+    </message>
+    <message>
+        <source>QML Observer is used to offer debugging features for QML applications, such as interactive debugging and inspection tools. It must be compiled for each used Qt version separately. On the Qt4 options page, select the current Qt installation and click Rebuild.</source>
+        <translation>QML Observer umożliwia interaktywne debugowanie aplikacji QML. Aplikacja musi być skompilowana dla każdej wersji Qt. W tym celu wybierz bieżącą instalację Qt w ustawieniach Qt4 i kliknij Przebuduj.</translation>
+    </message>
+</context>
+<context>
+    <name>RemoteLinux::AbstractMaemoPackageCreationStep</name>
+    <message>
+        <source>Package up to date.</source>
+        <translation>Pakiet aktualny.</translation>
+    </message>
+    <message>
+        <source>Creating package file ...</source>
+        <translation>Tworzenie pliku pakietu...</translation>
+    </message>
+    <message>
+        <source>Package created.</source>
+        <translation>Utworzono pakiet.</translation>
+    </message>
+    <message>
+        <source>Packaging failed.</source>
+        <translation>Błąd pakowania.</translation>
+    </message>
+    <message>
+        <source>Packaging error: No Qt version.</source>
+        <translation>Błąd pakowania: Brak wersji Qt.</translation>
+    </message>
+    <message>
+        <source>Package Creation: Running command &apos;%1&apos;.</source>
+        <translation>Tworzenie pakietu: Uruchamianie komendy &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>Packaging error: Could not start command &apos;%1&apos;. Reason: %2</source>
+        <translation>Błąd pakowania: Nie można uruchomić komendy &quot;%1&quot;. Powód: %2</translation>
+    </message>
+    <message>
+        <source>Packaging Error: Command &apos;%1&apos; failed.</source>
+        <translation>Błąd pakowania: Komenda &quot;%1&quot; zakończona błędem.</translation>
+    </message>
+    <message>
+        <source> Reason: %1</source>
+        <translation> Powód: %1</translation>
+    </message>
+    <message>
+        <source>Exit code: %1</source>
+        <translation>Kod wyjściowy: %1</translation>
+    </message>
+</context>
+<context>
+    <name>RemoteLinux::MaemoDebianPackageCreationStep</name>
+    <message>
+        <source>Create Debian Package</source>
+        <translation>Utwórz pakiet Debian</translation>
+    </message>
+    <message>
+        <source>Packaging failed.</source>
+        <translation>Błąd pakowania.</translation>
+    </message>
+    <message>
+        <source>Could not move package files from %1 to %2.</source>
+        <translation>Nie można przenieść plików pakietu z %1 do %2.</translation>
+    </message>
+    <message>
+        <source>Your project name contains characters not allowed in Debian packages.
+They must only use lower-case letters, numbers, &apos;-&apos;, &apos;+&apos; and &apos;.&apos;.
+We will try to work around that, but you may experience problems.</source>
+        <translation>Nazwa projektu zawiera znaki, które są niedozwolone w pakietach Debiana.
+Dozwolonymi znakami są tylko małe litery, liczby, &apos;-&apos;, &apos;+&apos; oraz &apos;.&apos;.
+Przy obecnej nazwie możesz spodziewać się problemów.</translation>
+    </message>
+    <message>
+        <source>Packaging failed: Foreign debian directory detected.</source>
+        <translation>Błąd podczas tworzenia pakietu: wykryto obcy katalog Debiana.</translation>
+    </message>
+    <message>
+        <source>You are not using a shadow build and there is a debian directory in your project root (&apos;%1&apos;). Qt Creator will not overwrite that directory. Please remove it or use the shadow build feature.</source>
+        <translation>Kompilacja w innym miejscu nie została użyta, a w projekcie występuje katalog debian (&quot;%1&quot;). Ten katalog nie zostanie nadpisany. Usuń go lub skompiluj projekt w innym miejscu.</translation>
+    </message>
+    <message>
+        <source>Could not remove directory &apos;%1&apos;: %2</source>
+        <translation>Nie można usunąć katalogu &quot;%1&quot;: %2</translation>
+    </message>
+    <message>
+        <source>Could not create Debian directory &apos;%1&apos;.</source>
+        <translation>Nie można utworzyć katalogu Debian w &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>Could not copy file &apos;%1&apos; to &apos;%2&apos;</source>
+        <translation>Nie można skopiować pliku &quot;%1&quot; do &quot;%2&quot;</translation>
+    </message>
+    <message>
+        <source>Error: Could not create file &apos;%1&apos;.</source>
+        <translation>Błąd: Nie można utworzyć pliku &quot;%1&quot;.</translation>
+    </message>
+</context>
+<context>
+    <name>RemoteLinux::MaemoRpmPackageCreationStep</name>
+    <message>
+        <source>Create RPM Package</source>
+        <translation>Utwórz pakiet RPM</translation>
+    </message>
+    <message>
+        <source>Packaging failed.</source>
+        <translation>Błąd pakowania.</translation>
+    </message>
+    <message>
+        <source>Could not move package file from %1 to %2.</source>
+        <translation>Nie można przenieść pliku pakietu z %1 do %2.</translation>
+    </message>
+</context>
+<context>
+    <name>RemoteLinux::CreateTarStepWidget</name>
+    <message>
+        <source>Create tarball:</source>
+        <translation>Utwórz tarball:</translation>
+    </message>
+</context>
+<context>
+    <name>RemoteLinux::MaemoTarPackageCreationStep</name>
+    <message>
+        <source>Create tarball</source>
+        <translation>Utwórz tarball</translation>
+    </message>
+    <message>
+        <source>Error: tar file %1 cannot be opened (%2).</source>
+        <translation>Błąd: nie można otworzyć pliku tar %1 (%2).</translation>
+    </message>
+    <message>
+        <source>Error writing tar file &apos;%1&apos;: %2.</source>
+        <translation>Błąd zapisu pliku tar &quot;%1&quot;: %2.</translation>
+    </message>
+    <message>
+        <source>Error reading file &apos;%1&apos;: %2.</source>
+        <translation>Błąd odczytu pliku &quot;%1&quot;: %2.</translation>
+    </message>
+    <message>
+        <source>Cannot add file &apos;%1&apos; to tar-archive: path too long.</source>
+        <translation>Nie można dodać pliku &quot;%1&quot; do archiwum tar: zbyt długa ścieżka.</translation>
+    </message>
+    <message>
+        <source>Error writing tar file &apos;%1&apos;: %2</source>
+        <translation>Błąd zapisu pliku tar &quot;%1&quot;: %2</translation>
+    </message>
+</context>
+<context>
+    <name>RemoteLinux::Internal::MaemoUploadAndInstallTarPackageStep</name>
+    <message>
+        <source>Deploy tarball via SFTP upload</source>
+        <translation>Zainstaluj tarball poprzez SFTP</translation>
+    </message>
+</context>
+<context>
+    <name>RemoteLinux::Internal::RemoteLinuxRunConfigurationFactory</name>
+    <message>
+        <source> (on Remote Generic Linux Host)</source>
+        <translation> (na zdalnym hoście linuksowym)</translation>
+    </message>
+</context>
+<context>
+    <name>Valgrind::Internal::ValgrindRunControlFactory</name>
+    <message>
+        <source>Analyzer</source>
+        <translation>Analizator</translation>
+    </message>
+</context>
+<context>
+    <name>Valgrind::Internal::ValgrindBaseSettings</name>
+    <message>
+        <source>Valgrind</source>
+        <translation>Valgrind</translation>
+    </message>
+</context>
 </TS>
diff --git a/share/qtcreator/welcomescreen/components/components.pro b/share/qtcreator/welcomescreen/components/components.pro
deleted file mode 100644
index 83e0a3d4c0..0000000000
--- a/share/qtcreator/welcomescreen/components/components.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = styleitem
diff --git a/share/qtcreator/welcomescreen/components/styleitem/styleitem.pro b/share/qtcreator/welcomescreen/components/styleitem/styleitem.pro
deleted file mode 100644
index 25f403a90d..0000000000
--- a/share/qtcreator/welcomescreen/components/styleitem/styleitem.pro
+++ /dev/null
@@ -1,78 +0,0 @@
-TEMPLATE = lib
-CONFIG += qt plugin
-QT += declarative
-QT += script
- 
-TARGET  = styleplugin
-include(../../../../../qtcreator.pri)
-DESTDIR = $$IDE_DATA_PATH/welcomescreen/components/plugin
-OBJECTS_DIR = tmp
-MOC_DIR = tmp
-
-HEADERS += qtmenu.h \
-           qtmenubar.h \
-           qtmenuitem.h \
-           qrangemodel_p.h \
-           qrangemodel.h \
-           qstyleplugin.h \
-           qdeclarativefolderlistmodel.h \
-           qstyleitem.h \
-           qwheelarea.h
-
-SOURCES += qtmenu.cpp \
-           qtmenubar.cpp \
-           qtmenuitem.cpp \
-           qrangemodel.cpp \
-	   qstyleplugin.cpp \
-           qdeclarativefolderlistmodel.cpp \
-           qstyleitem.cpp \
-           qwheelarea.cpp
-           
-
-OTHER_FILES += \
-    ../gallery.qml \
-    ../widgets/Tab.qml \
-    ../widgets/TabBar.qml \
-    ../widgets/TabFrame.qml \
-    ../Button.qml \
-    ../ButtonRow.qml \
-    ../CheckBox.qml \
-    ../ChoiceList.qml \
-    ../components.pro \
-    ../ContextMenu.qml \
-    ../Dial.qml \
-    ../Frame.qml \
-    ../GroupBox.qml \
-    ../Menu.qml \
-    ../ProgressBar.qml \
-    ../RadioButton.qml \
-    ../ScrollArea.qml \
-    ../ScrollBar.qml \
-    ../Slider.qml \
-    ../SpinBox.qml \
-    ../Switch.qml \
-    ../Tab.qml \
-    ../TableView.qml \
-    ../TabBar.qml \
-    ../TabFrame.qml \
-    ../TextArea.qml \
-    ../TextField.qml \
-    ../TextScrollArea.qml \
-    ../ToolBar.qml \
-    ../ToolButton.qml \
-    ../custom/BasicButton.qml \
-    ../custom/BusyIndicator.qml \
-    ../custom/Button.qml \
-    ../custom/ButtonColumn.qml \
-    ../custom/ButtonGroup.js \
-    ../custom/ButtonRow.qml \
-    ../custom/CheckBox.qml \
-    ../custom/ChoiceList.qml \
-    ../custom/ProgressBar.qml \
-    ../custom/Slider.qml \
-    ../custom/SpinBox.qml \
-    ../custom/TextField.qml \
-    ../../examples/Browser.qml \
-    ../../examples/Panel.qml \
-    ../../examples/ModelView.qml \
-    ../../examples/Gallery.qml
diff --git a/share/qtcreator/welcomescreen/develop.qml b/share/qtcreator/welcomescreen/develop.qml
index f4e7defdb9..e8241f8b2e 100644
--- a/share/qtcreator/welcomescreen/develop.qml
+++ b/share/qtcreator/welcomescreen/develop.qml
@@ -32,7 +32,7 @@
 
 import QtQuick 1.0
 import "widgets" as Widgets
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Item {
     id: root
diff --git a/share/qtcreator/welcomescreen/welcomescreen.pro b/share/qtcreator/welcomescreen/welcomescreen.pro
deleted file mode 100644
index 9728d2ab11..0000000000
--- a/share/qtcreator/welcomescreen/welcomescreen.pro
+++ /dev/null
@@ -1,26 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = components/styleitem
-
-QML_IMPORT_PATH += $$OUT_PWD
-
-OTHER_FILES = develop.qml \
-              gettingstarted.qml \
-              newssupport.qml \
-              welcomescreen.qml \
-              widgets/Button.qml \
-              widgets/CheckBox.qml \
-              widgets/Feedback.qml \
-              widgets/RatingBar.qml \
-              widgets/ExampleBrowser.qml \
-              widgets/LineEdit.qml \
-              widgets/ExampleDelegate.qml \
-              widgets/LinksBar.qml \
-              widgets/HeaderItemView.qml \
-              widgets/RecentSessions.qml \
-              widgets/RecentProjects.qml \
-              widgets/FeaturedAndNewsListing.qml \
-              widgets/NewsListing.qml \
-              widgets/TabWidget.qml \
-              widgets/TagBrowser.qml \
-              examples_fallback.xml \
-              qtcreator_tutorials.xml
diff --git a/share/qtcreator/welcomescreen/welcomescreen.qml b/share/qtcreator/welcomescreen/welcomescreen.qml
index 68f9761ffc..7421e10b79 100644
--- a/share/qtcreator/welcomescreen/welcomescreen.qml
+++ b/share/qtcreator/welcomescreen/welcomescreen.qml
@@ -32,7 +32,7 @@
 
 import QtQuick 1.0
 import "widgets"
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Rectangle {
     id: root
diff --git a/share/qtcreator/welcomescreen/widgets/Button.qml b/share/qtcreator/welcomescreen/widgets/Button.qml
index ff87fadd09..4c93989177 100644
--- a/share/qtcreator/welcomescreen/widgets/Button.qml
+++ b/share/qtcreator/welcomescreen/widgets/Button.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import Qt 4.7
-import "../components/custom" as Custom
+import qtcomponents.custom 1.0 as Custom
 
 Custom.Button {
     id: button
diff --git a/share/qtcreator/welcomescreen/widgets/CheckBox.qml b/share/qtcreator/welcomescreen/widgets/CheckBox.qml
index e61299b018..0124c7944f 100644
--- a/share/qtcreator/welcomescreen/widgets/CheckBox.qml
+++ b/share/qtcreator/welcomescreen/widgets/CheckBox.qml
@@ -1,5 +1,5 @@
 import QtQuick 1.0
-import "../components/custom" as Custom
+import qtcomponents.custom 1.0 as Custom
 
 Custom.CheckBox{
     id:checkbox
diff --git a/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml b/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml
index e4abd7bcce..b033135ebc 100644
--- a/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml
+++ b/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml
@@ -31,8 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import components 1.0 as Components
-import widgets 1.0 as Widgets
+import qtcomponents 1.0 as Components
 
 Item {
     id: exampleBrowserRoot
@@ -57,7 +56,7 @@ Item {
         anchors.leftMargin: - 8
         anchors.rightMargin: scrollArea.verticalScrollBar.visible ? 0 : -8
 
-        Widgets.LineEdit {
+        LineEdit {
             id: lineEdit
             placeholderText: !checkBox.checked ? qsTr("Search in Tutorials") : qsTr("Search in Tutorials, Examples and Demos")
             focus: true
diff --git a/share/qtcreator/welcomescreen/widgets/ExampleDelegate.qml b/share/qtcreator/welcomescreen/widgets/ExampleDelegate.qml
index 21106ca15e..4a5a0c2bb3 100644
--- a/share/qtcreator/welcomescreen/widgets/ExampleDelegate.qml
+++ b/share/qtcreator/welcomescreen/widgets/ExampleDelegate.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Rectangle {
     id: root
diff --git a/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml b/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
index 9373d6ffb6..7870efacfd 100644
--- a/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
+++ b/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Item {
     InsetText {
diff --git a/share/qtcreator/welcomescreen/widgets/Feedback.qml b/share/qtcreator/welcomescreen/widgets/Feedback.qml
index d84a151ebd..9fb685d184 100644
--- a/share/qtcreator/welcomescreen/widgets/Feedback.qml
+++ b/share/qtcreator/welcomescreen/widgets/Feedback.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Rectangle {
     id: inner_background
diff --git a/share/qtcreator/welcomescreen/widgets/LineEdit.qml b/share/qtcreator/welcomescreen/widgets/LineEdit.qml
index b6e30e96f7..163db18bda 100644
--- a/share/qtcreator/welcomescreen/widgets/LineEdit.qml
+++ b/share/qtcreator/welcomescreen/widgets/LineEdit.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import "../components/custom" as Custom
+import qtcomponents.custom 1.0 as Custom
 
 
 Custom.TextField {
diff --git a/share/qtcreator/welcomescreen/widgets/LinksBar.qml b/share/qtcreator/welcomescreen/widgets/LinksBar.qml
index dbf3ce55b3..8be29fa349 100644
--- a/share/qtcreator/welcomescreen/widgets/LinksBar.qml
+++ b/share/qtcreator/welcomescreen/widgets/LinksBar.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Row {
     id: tabBar
diff --git a/share/qtcreator/welcomescreen/widgets/NewsListing.qml b/share/qtcreator/welcomescreen/widgets/NewsListing.qml
index 033ce7ce8b..98fad9558d 100644
--- a/share/qtcreator/welcomescreen/widgets/NewsListing.qml
+++ b/share/qtcreator/welcomescreen/widgets/NewsListing.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.1
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 Item {
     id: root
diff --git a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml
index 0c620bbd9b..6ead30af36 100644
--- a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml
+++ b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml
@@ -31,7 +31,7 @@
 **************************************************************************/
 
 import QtQuick 1.1
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 HeaderItemView {
     header: qsTr("Recently Edited Projects")
diff --git a/share/qtcreator/welcomescreen/widgets/RecentSessions.qml b/share/qtcreator/welcomescreen/widgets/RecentSessions.qml
index 19c6fb6c3a..4f99da6295 100644
--- a/share/qtcreator/welcomescreen/widgets/RecentSessions.qml
+++ b/share/qtcreator/welcomescreen/widgets/RecentSessions.qml
@@ -31,14 +31,14 @@
 **************************************************************************/
 
 import QtQuick 1.0
-import components 1.0 as Components
+import qtcomponents 1.0 as Components
 
 HeaderItemView {
     header: qsTr("Recently Used Sessions")
     model: sessionList
 
     delegate: Rectangle {
-        height: 60
+        height: 30
         width: dataSection.width
 
         Rectangle {
diff --git a/share/share.pro b/share/share.pro
index df8f06e11e..69509a0098 100644
--- a/share/share.pro
+++ b/share/share.pro
@@ -1,4 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS = qtcreator/static.pro \
-          qtcreator/translations \
-          qtcreator/welcomescreen
+          qtcreator/translations
diff --git a/src/libs/3rdparty/cplusplus/Bind.cpp b/src/libs/3rdparty/cplusplus/Bind.cpp
index 16c2ea6c3f..db01e84e7d 100644
--- a/src/libs/3rdparty/cplusplus/Bind.cpp
+++ b/src/libs/3rdparty/cplusplus/Bind.cpp
@@ -2771,6 +2771,21 @@ bool Bind::visit(ClassSpecifierAST *ast)
                 startScopeOffset = tokenAt(q->unqualified_name->lastToken() - 1).end(); // at the end of the unqualified name
             }
         }
+
+        // get the unqualified class name
+        const QualifiedNameId *q = className->asQualifiedNameId();
+        const Name *unqualifiedClassName = q ? q->name() : className;
+
+        if (! unqualifiedClassName) // paranoia check
+            className = 0;
+        else if (! (unqualifiedClassName->isNameId() || unqualifiedClassName->isTemplateNameId())) {
+            translationUnit()->error(sourceLocation, "expected a class-name");
+
+            className = unqualifiedClassName->identifier();
+
+            if (q && className)
+                className = control()->qualifiedNameId(q->base(), className);
+        }
     }
 
     Class *klass = control()->newClass(sourceLocation, className);
diff --git a/src/libs/libs.pro b/src/libs/libs.pro
index f963d67801..658fc3fe99 100644
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -15,7 +15,8 @@ SUBDIRS   = \
     qmljs \
     qmljsdebugclient \
     glsl \
-    qmleditorwidgets
+    qmleditorwidgets \
+    qtcomponents/styleitem
 
 # Windows: Compile Qt Creator CDB extension if Debugging tools can be detected.    
 win32 {
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.cpp b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp
index dda23630c0..dda23630c0 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.cpp
+++ b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.h b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.h
index 9beb4d575e..9beb4d575e 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qdeclarativefolderlistmodel.h
+++ b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.cpp b/src/libs/qtcomponents/styleitem/qrangemodel.cpp
index 0eb29fa45c..0eb29fa45c 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.cpp
+++ b/src/libs/qtcomponents/styleitem/qrangemodel.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.h b/src/libs/qtcomponents/styleitem/qrangemodel.h
index 744ae348e5..744ae348e5 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel.h
+++ b/src/libs/qtcomponents/styleitem/qrangemodel.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel_p.h b/src/libs/qtcomponents/styleitem/qrangemodel_p.h
index 8cfeeae4a9..8cfeeae4a9 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qrangemodel_p.h
+++ b/src/libs/qtcomponents/styleitem/qrangemodel_p.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.cpp b/src/libs/qtcomponents/styleitem/qstyleitem.cpp
index ccb56b1237..ccb56b1237 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.cpp
+++ b/src/libs/qtcomponents/styleitem/qstyleitem.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.h b/src/libs/qtcomponents/styleitem/qstyleitem.h
index 83233d810e..83233d810e 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qstyleitem.h
+++ b/src/libs/qtcomponents/styleitem/qstyleitem.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.cpp b/src/libs/qtcomponents/styleitem/qstyleplugin.cpp
index 6ba3473839..6ba3473839 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.cpp
+++ b/src/libs/qtcomponents/styleitem/qstyleplugin.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.h b/src/libs/qtcomponents/styleitem/qstyleplugin.h
index 144cb48aff..144cb48aff 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qstyleplugin.h
+++ b/src/libs/qtcomponents/styleitem/qstyleplugin.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenu.cpp b/src/libs/qtcomponents/styleitem/qtmenu.cpp
index 55bea2ce45..55bea2ce45 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qtmenu.cpp
+++ b/src/libs/qtcomponents/styleitem/qtmenu.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenu.h b/src/libs/qtcomponents/styleitem/qtmenu.h
index d22dc1f822..d22dc1f822 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qtmenu.h
+++ b/src/libs/qtcomponents/styleitem/qtmenu.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.cpp b/src/libs/qtcomponents/styleitem/qtmenubar.cpp
index b50331be74..b50331be74 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.cpp
+++ b/src/libs/qtcomponents/styleitem/qtmenubar.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.h b/src/libs/qtcomponents/styleitem/qtmenubar.h
index 241a098ab7..241a098ab7 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qtmenubar.h
+++ b/src/libs/qtcomponents/styleitem/qtmenubar.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.cpp b/src/libs/qtcomponents/styleitem/qtmenuitem.cpp
index a946542894..a946542894 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.cpp
+++ b/src/libs/qtcomponents/styleitem/qtmenuitem.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.h b/src/libs/qtcomponents/styleitem/qtmenuitem.h
index 5fc47e2c92..5fc47e2c92 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qtmenuitem.h
+++ b/src/libs/qtcomponents/styleitem/qtmenuitem.h
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.cpp b/src/libs/qtcomponents/styleitem/qwheelarea.cpp
index a3610c54c8..a3610c54c8 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.cpp
+++ b/src/libs/qtcomponents/styleitem/qwheelarea.cpp
diff --git a/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.h b/src/libs/qtcomponents/styleitem/qwheelarea.h
index cf71847c76..cf71847c76 100644
--- a/share/qtcreator/welcomescreen/components/styleitem/qwheelarea.h
+++ b/src/libs/qtcomponents/styleitem/qwheelarea.h
diff --git a/src/libs/qtcomponents/styleitem/styleitem.pro b/src/libs/qtcomponents/styleitem/styleitem.pro
new file mode 100644
index 0000000000..aa52c88a13
--- /dev/null
+++ b/src/libs/qtcomponents/styleitem/styleitem.pro
@@ -0,0 +1,34 @@
+TEMPLATE = lib
+CONFIG += qt plugin
+QT += declarative
+QT += script
+
+TARGET  = styleplugin
+include(../../../../qtcreator.pri)
+DESTDIR = $$IDE_LIBRARY_PATH/qtcomponents/plugin
+OBJECTS_DIR = tmp
+MOC_DIR = tmp
+
+HEADERS += qtmenu.h \
+           qtmenubar.h \
+           qtmenuitem.h \
+           qrangemodel_p.h \
+           qrangemodel.h \
+           qstyleplugin.h \
+           qdeclarativefolderlistmodel.h \
+           qstyleitem.h \
+           qwheelarea.h
+
+SOURCES += qtmenu.cpp \
+           qtmenubar.cpp \
+           qtmenuitem.cpp \
+           qrangemodel.cpp \
+           qstyleplugin.cpp \
+           qdeclarativefolderlistmodel.cpp \
+           qstyleitem.cpp \
+           qwheelarea.cpp
+
+!macx {
+    target.path = /lib/qtcreator/qtcomponents/plugin
+    INSTALLS += target
+}
diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri
index 2dfb07dde6..36b9226bdf 100644
--- a/src/libs/utils/utils-lib.pri
+++ b/src/libs/utils/utils-lib.pri
@@ -104,7 +104,6 @@ unix:!macx {
     SOURCES += $$PWD/unixutils.cpp
 }
 HEADERS += \
-    $$PWD/app_version.h \
     $$PWD/environment.h \
     $$PWD/environmentmodel.h \
     $$PWD/qtcprocess.h \
diff --git a/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp b/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp
index b507c68e23..1be2b4d5c7 100644
--- a/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp
+++ b/src/plugins/analyzerbase/analyzerrunconfigwidget.cpp
@@ -34,13 +34,12 @@
 
 #include "analyzerrunconfigwidget.h"
 
-#include "analyzersettings.h"
-
 #include <utils/detailswidget.h>
 #include <utils/qtcassert.h>
 
 #include <QtCore/QDebug>
-#include <QtGui/QGroupBox>
+#include <QtGui/QApplication>
+#include <QtGui/QLabel>
 #include <QtGui/QVBoxLayout>
 
 namespace Analyzer {
@@ -52,6 +51,29 @@ AnalyzerRunConfigWidget::AnalyzerRunConfigWidget()
     new QVBoxLayout(mainWidget);
     m_detailsWidget->setWidget(mainWidget);
 
+    QWidget *globalSetting = new QWidget(mainWidget);
+    QHBoxLayout *globalSettingLayout = new QHBoxLayout(globalSetting);
+    mainWidget->layout()->addWidget(globalSetting);
+    QLabel *label = new QLabel(displayName(), globalSetting);
+    globalSettingLayout->addWidget(label);
+    m_settingsCombo = new QComboBox(globalSetting);
+    m_settingsCombo->addItems(QStringList()
+                            << QApplication::translate("ProjectExplorer::Internal::EditorSettingsPropertiesPage", "Global")
+                            << QApplication::translate("ProjectExplorer::Internal::EditorSettingsPropertiesPage", "Custom")
+                            );
+    globalSettingLayout->addWidget(m_settingsCombo);
+    connect(m_settingsCombo, SIGNAL(activated(int)), this, SLOT(chooseSettings(int)));
+    m_restoreButton = new QPushButton(
+                QApplication::translate("ProjectExplorer::Internal::EditorSettingsPropertiesPage", "Restore Global"),
+                globalSetting);
+    globalSettingLayout->addWidget(m_restoreButton);
+    connect(m_restoreButton, SIGNAL(clicked()), this, SLOT(restoreGlobal()));
+    globalSettingLayout->addStretch(2);
+
+    m_subConfigWidget = new QWidget(mainWidget);
+    mainWidget->layout()->addWidget(m_subConfigWidget);
+    new QVBoxLayout(m_subConfigWidget);
+
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_detailsWidget);
@@ -66,23 +88,39 @@ void AnalyzerRunConfigWidget::setRunConfiguration(ProjectExplorer::RunConfigurat
 {
     QTC_ASSERT(rc, return);
 
-    AnalyzerProjectSettings *settings = rc->extraAspect<AnalyzerProjectSettings>();
-    QTC_ASSERT(settings, return);
+    m_settings = rc->extraAspect<AnalyzerProjectSettings>();
+    QTC_ASSERT(m_settings, return);
 
     // update summary text
     QStringList tools;
-    foreach (AbstractAnalyzerSubConfig *config, settings->subConfigs()) {
+    foreach (AbstractAnalyzerSubConfig *config, m_settings->subConfigs()) {
         tools << QString("<strong>%1</strong>").arg(config->displayName());
     }
     m_detailsWidget->setSummaryText(tr("Available settings: %1").arg(tools.join(", ")));
 
     // add group boxes for each sub config
-    QLayout *layout = m_detailsWidget->widget()->layout();
-    foreach (AbstractAnalyzerSubConfig *config, settings->subConfigs()) {
-        (void) new QGroupBox(config->displayName());
+    QLayout *layout = m_subConfigWidget->layout();
+    foreach (AbstractAnalyzerSubConfig *config, m_settings->customSubConfigs()) {
         QWidget *widget = config->createConfigWidget(this);
         layout->addWidget(widget);
     }
+    m_subConfigWidget->setEnabled(!m_settings->isUsingGlobalSettings());
+    m_settingsCombo->setCurrentIndex(m_settings->isUsingGlobalSettings() ? 0 : 1);
+    m_restoreButton->setEnabled(!m_settings->isUsingGlobalSettings());
+}
+
+void AnalyzerRunConfigWidget::chooseSettings(int setting)
+{
+    QTC_ASSERT(m_settings, return);
+    m_settings->setUsingGlobalSettings(setting == 0);
+    m_subConfigWidget->setEnabled(!m_settings->isUsingGlobalSettings());
+    m_restoreButton->setEnabled(!m_settings->isUsingGlobalSettings());
+}
+
+void AnalyzerRunConfigWidget::restoreGlobal()
+{
+    QTC_ASSERT(m_settings, return);
+    m_settings->resetCustomToGlobalSettings();
 }
 
 } // namespace Analyzer
diff --git a/src/plugins/analyzerbase/analyzerrunconfigwidget.h b/src/plugins/analyzerbase/analyzerrunconfigwidget.h
index 76c4ae636e..c18762d3a0 100644
--- a/src/plugins/analyzerbase/analyzerrunconfigwidget.h
+++ b/src/plugins/analyzerbase/analyzerrunconfigwidget.h
@@ -35,8 +35,13 @@
 #ifndef ANALYZER_INTERNAL_ANALYZERRUNCONFIGWIDGET_H
 #define ANALYZER_INTERNAL_ANALYZERRUNCONFIGWIDGET_H
 
+#include "analyzerbase_global.h"
+#include "analyzersettings.h"
+
 #include <projectexplorer/runconfiguration.h>
-#include <analyzerbase/analyzerbase_global.h>
+
+#include <QtGui/QComboBox>
+#include <QtGui/QPushButton>
 
 namespace Utils {
 class DetailsWidget;
@@ -57,8 +62,16 @@ public:
 
     void setRunConfiguration(ProjectExplorer::RunConfiguration *rc);
 
+private slots:
+    void chooseSettings(int setting);
+    void restoreGlobal();
+
 private:
     Utils::DetailsWidget *m_detailsWidget;
+    QWidget *m_subConfigWidget;
+    AnalyzerProjectSettings *m_settings;
+    QComboBox *m_settingsCombo;
+    QPushButton *m_restoreButton;
 };
 
 } // namespace Analyzer
diff --git a/src/plugins/analyzerbase/analyzersettings.cpp b/src/plugins/analyzerbase/analyzersettings.cpp
index 89fa68b1c2..82cd973c19 100644
--- a/src/plugins/analyzerbase/analyzersettings.cpp
+++ b/src/plugins/analyzerbase/analyzersettings.cpp
@@ -47,6 +47,7 @@
 using namespace Analyzer::Internal;
 
 static const char groupC[] = "Analyzer";
+static const char useGlobalC[] = "Analyzer.Project.UseGlobal";
 
 namespace Analyzer {
 
@@ -57,28 +58,38 @@ AnalyzerSettings::AnalyzerSettings(QObject *parent)
 {
 }
 
+QVariantMap AnalyzerSettings::defaults() const
+{
+    QVariantMap map;
+    foreach (AbstractAnalyzerSubConfig *config, subConfigs()) {
+        map.unite(config->defaults());
+    }
+    return map;
+}
+
 bool AnalyzerSettings::fromMap(const QVariantMap &map)
 {
+    return fromMap(map, &m_subConfigs);
+}
+
+bool AnalyzerSettings::fromMap(const QVariantMap &map, QList<AbstractAnalyzerSubConfig *> *subConfigs)
+{
     bool ret = true;
-    foreach (AbstractAnalyzerSubConfig *config, subConfigs()) {
+    foreach (AbstractAnalyzerSubConfig *config, *subConfigs) {
         ret = ret && config->fromMap(map);
     }
     return ret;
 }
 
-QVariantMap AnalyzerSettings::defaults() const
+QVariantMap AnalyzerSettings::toMap() const
 {
-    QVariantMap map;
-    foreach (AbstractAnalyzerSubConfig *config, subConfigs()) {
-        map.unite(config->defaults());
-    }
-    return map;
+    return toMap(m_subConfigs);
 }
 
-QVariantMap AnalyzerSettings::toMap() const
+QVariantMap AnalyzerSettings::toMap(const QList<AbstractAnalyzerSubConfig *> &subConfigs) const
 {
     QVariantMap map;
-    foreach (AbstractAnalyzerSubConfig *config, subConfigs()) {
+    foreach (AbstractAnalyzerSubConfig *config, subConfigs) {
         map.unite(config->toMap());
     }
     return map;
@@ -102,6 +113,7 @@ AnalyzerGlobalSettings *AnalyzerGlobalSettings::instance()
 AnalyzerGlobalSettings::~AnalyzerGlobalSettings()
 {
     m_instance = 0;
+    qDeleteAll(m_subConfigs);
 }
 
 void AnalyzerGlobalSettings::readSettings()
@@ -134,30 +146,36 @@ void AnalyzerGlobalSettings::writeSettings() const
 void AnalyzerGlobalSettings::registerSubConfigs
     (AnalyzerSubConfigFactory globalCreator, AnalyzerSubConfigFactory projectCreator)
 {
-    m_projectSubConfigs.append(projectCreator);
+    m_projectSubConfigFactories.append(projectCreator);
 
     AbstractAnalyzerSubConfig *config = globalCreator();
-    config->setParent(this);
+    m_subConfigs.append(config);
     AnalyzerPlugin::instance()->addAutoReleasedObject(new AnalyzerOptionsPage(config));
 
     readSettings();
 }
 
-QList<AnalyzerSubConfigFactory> AnalyzerGlobalSettings::projectSubConfigs() const
+QList<AnalyzerSubConfigFactory> AnalyzerGlobalSettings::projectSubConfigFactories() const
 {
-    return m_projectSubConfigs;
+    return m_projectSubConfigFactories;
 }
 
 AnalyzerProjectSettings::AnalyzerProjectSettings(QObject *parent)
-    : AnalyzerSettings(parent)
+    : AnalyzerSettings(parent), m_useGlobalSettings(true)
 {
     // add sub configs
-    foreach (AnalyzerSubConfigFactory factory, AnalyzerGlobalSettings::instance()->projectSubConfigs())
-        factory()->setParent(this);
+    foreach (AnalyzerSubConfigFactory factory, AnalyzerGlobalSettings::instance()->projectSubConfigFactories()) {
+        AbstractAnalyzerSubConfig *config = factory();
+        m_customConfigurations.append(config);
+    }
 
-    // take defaults from global settings
-    AnalyzerGlobalSettings *gs = AnalyzerGlobalSettings::instance();
-    fromMap(gs->toMap());
+    m_subConfigs = AnalyzerGlobalSettings::instance()->subConfigs();
+    resetCustomToGlobalSettings();
+}
+
+AnalyzerProjectSettings::~AnalyzerProjectSettings()
+{
+    qDeleteAll(m_customConfigurations);
 }
 
 QString AnalyzerProjectSettings::displayName() const
@@ -167,12 +185,35 @@ QString AnalyzerProjectSettings::displayName() const
 
 bool AnalyzerProjectSettings::fromMap(const QVariantMap &map)
 {
-    return AnalyzerSettings::fromMap(map);
+    if (!AnalyzerSettings::fromMap(map, &m_customConfigurations))
+        return false;
+    m_useGlobalSettings = map.value(QLatin1String(useGlobalC), true).toBool();
+    return true;
 }
 
 QVariantMap AnalyzerProjectSettings::toMap() const
 {
-    return AnalyzerSettings::toMap();
+    QVariantMap map = AnalyzerSettings::toMap(m_customConfigurations);
+    map.insert(QLatin1String(useGlobalC), m_useGlobalSettings);
+    return map;
+}
+
+void AnalyzerProjectSettings::setUsingGlobalSettings(bool value)
+{
+    if (value == m_useGlobalSettings)
+        return;
+    m_useGlobalSettings = value;
+    if (m_useGlobalSettings) {
+        m_subConfigs = AnalyzerGlobalSettings::instance()->subConfigs();
+    } else {
+        m_subConfigs = m_customConfigurations;
+    }
+}
+
+void AnalyzerProjectSettings::resetCustomToGlobalSettings()
+{
+    AnalyzerGlobalSettings *gs = AnalyzerGlobalSettings::instance();
+    AnalyzerSettings::fromMap(gs->toMap(), &m_customConfigurations);
 }
 
 } // namespace Analyzer
diff --git a/src/plugins/analyzerbase/analyzersettings.h b/src/plugins/analyzerbase/analyzersettings.h
index b71c1d9904..8861090e0e 100644
--- a/src/plugins/analyzerbase/analyzersettings.h
+++ b/src/plugins/analyzerbase/analyzersettings.h
@@ -95,12 +95,16 @@ public:
     template<class T>
     T *subConfig() const
     {
-        return findChild<T *>();
+        foreach (AbstractAnalyzerSubConfig *subConfig, subConfigs()) {
+            if (T *config = qobject_cast<T *>(subConfig))
+                return config;
+        }
+        return 0;
     }
 
     QList<AbstractAnalyzerSubConfig *> subConfigs() const
     {
-        return findChildren<AbstractAnalyzerSubConfig *>();
+        return m_subConfigs;
     }
 
     QVariantMap defaults() const;
@@ -109,7 +113,11 @@ public:
 protected:
     virtual bool fromMap(const QVariantMap &map);
 
+    QVariantMap toMap(const QList<AbstractAnalyzerSubConfig *> &subConfigs) const;
+    bool fromMap(const QVariantMap &map, QList<AbstractAnalyzerSubConfig *> *subConfigs);
+
     AnalyzerSettings(QObject *parent);
+    QList<AbstractAnalyzerSubConfig *> m_subConfigs;
 };
 
 
@@ -137,12 +145,12 @@ public:
     void readSettings();
 
     void registerSubConfigs(AnalyzerSubConfigFactory globalFactory, AnalyzerSubConfigFactory projectFactory);
-    QList<AnalyzerSubConfigFactory> projectSubConfigs() const;
+    QList<AnalyzerSubConfigFactory> projectSubConfigFactories() const;
 
 private:
     AnalyzerGlobalSettings(QObject *parent);
     static AnalyzerGlobalSettings *m_instance;
-    QList<AnalyzerSubConfigFactory> m_projectSubConfigs;
+    QList<AnalyzerSubConfigFactory> m_projectSubConfigFactories;
 };
 
 /**
@@ -161,12 +169,23 @@ class ANALYZER_EXPORT AnalyzerProjectSettings
 
 public:
     AnalyzerProjectSettings(QObject *parent = 0);
+    ~AnalyzerProjectSettings();
 
     QString displayName() const;
     virtual QVariantMap toMap() const;
 
+    bool isUsingGlobalSettings() const { return m_useGlobalSettings; }
+    void setUsingGlobalSettings(bool value);
+    void resetCustomToGlobalSettings();
+
+    QList<AbstractAnalyzerSubConfig *> customSubConfigs() const { return m_customConfigurations; }
+
 protected:
     virtual bool fromMap(const QVariantMap &map);
+
+private:
+    bool m_useGlobalSettings;
+    QList<AbstractAnalyzerSubConfig *> m_customConfigurations;
 };
 
 } // namespace Analyzer
diff --git a/src/plugins/bineditor/bineditor.cpp b/src/plugins/bineditor/bineditor.cpp
index f24b81289b..191e9345cd 100644
--- a/src/plugins/bineditor/bineditor.cpp
+++ b/src/plugins/bineditor/bineditor.cpp
@@ -1049,6 +1049,7 @@ bool BinEditor::event(QEvent *e)
         }
         default:;
         }
+        break;
     case QEvent::ToolTip: {
         const QHelpEvent *helpEvent = static_cast<const QHelpEvent *>(e);
         const QString tt = toolTip(helpEvent);
diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp
index caabbeced3..562199489e 100644
--- a/src/plugins/coreplugin/filemanager.cpp
+++ b/src/plugins/coreplugin/filemanager.cpp
@@ -628,8 +628,7 @@ bool FileManager::saveFile(IFile *file, const QString &fileName, bool *isReadOnl
         if (isReadOnly) {
             QFile ofi(effName);
             // Check whether the existing file is writable
-            if (ofi.exists() && !ofi.open(QIODevice::ReadWrite)
-                && ofi.error() == QFile::PermissionsError) {
+            if (!ofi.open(QIODevice::ReadWrite) && ofi.open(QIODevice::ReadOnly)) {
                 *isReadOnly = true;
                 goto out;
             }
diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 54dcaa0b86..ba0a6c9f83 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -332,8 +332,8 @@ DebuggerSettings::DebuggerSettings(QSettings *settings)
     item = new SavedAction(this);
     item->setText(tr("Break on \"qFatal\""));
     item->setCheckable(true);
-    item->setDefaultValue(true);
-    item->setValue(true);
+    item->setDefaultValue(false);
+    item->setValue(false);
     item->setSettingsKey(debugModeGroup, QLatin1String("BreakOnFatal"));
     insertItem(BreakOnFatal, item);
 
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 79f21d9ceb..9705366afa 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4822,7 +4822,8 @@ void GdbEngine::handleInferiorPrepared()
     }
 
     // Initial attempt to set breakpoints.
-    if (startParameters().startMode != AttachCore) {
+    if (startParameters().startMode != AttachCore
+            && !isSlaveEngine()) {
         showStatusMessage(tr("Setting breakpoints..."));
         showMessage(tr("Setting breakpoints..."));
         attemptBreakpointSynchronization();
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 963df0f16a..2c45927cda 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -285,7 +285,15 @@ void QmlCppEngine::updateAll()
 
 void QmlCppEngine::attemptBreakpointSynchronization()
 {
-    d->m_cppEngine->attemptBreakpointSynchronization();
+    if (d->m_qmlEngine->state() == InferiorRunOk
+            || d->m_qmlEngine->state() == InferiorRunRequested
+            || d->m_qmlEngine->state() == InferiorStopOk
+            || d->m_qmlEngine->state() == InferiorStopRequested) {
+        // We expect both engines to be set up correctly before hitting
+        // any breakpoints, therefore ignore any breakpoints that would
+        // be hit before QDeclarativeEngine is set up.
+        d->m_cppEngine->attemptBreakpointSynchronization();
+    }
     d->m_qmlEngine->attemptBreakpointSynchronization();
 }
 
@@ -547,15 +555,18 @@ void QmlCppEngine::slaveEngineStateChanged
 
     case InferiorRunOk:
         if (state() == EngineRunRequested) {
-            if (otherEngine->state() == InferiorRunOk)
+            if (otherEngine->state() == InferiorRunOk) {
+                attemptBreakpointSynchronization();
                 notifyEngineRunAndInferiorRunOk();
-            else if (otherEngine->state() == InferiorStopOk)
-                notifyEngineRunAndInferiorStopOk();
-            else
+            } else {
                 EDEBUG("... WAITING FOR OTHER INFERIOR RUN");
+            }
         } else {
             if (otherEngine->state() == InferiorRunOk) {
                 EDEBUG("PLANNED INFERIOR RUN");
+                if (state() == InferiorStopOk) {
+                    notifyInferiorRunRequested();
+                }
                 notifyInferiorRunOk();
             } else if (otherEngine->state() == InferiorStopOk) {
                 EDEBUG("PLANNED SINGLE INFERIOR RUN");
@@ -593,9 +604,6 @@ void QmlCppEngine::slaveEngineStateChanged
             } else if (state() == InferiorStopRequested) {
                 EDEBUG("... AN INFERIOR STOPPED EXPECTEDLY");
                 notifyInferiorStopOk();
-            } else if (otherEngine->state() == EngineRunRequested && otherEngine == d->m_qmlEngine) {
-                EDEBUG("... BREAKPOINT HIT IN C++ BEFORE QML STARTUP");
-                QTimer::singleShot(0, this, SLOT(skipCppBreakpoint()));
             } else if (state() == EngineRunRequested) {
                 EDEBUG("... AN INFERIOR FAILED STARTUP, OTHER STOPPED EXPECTEDLY");
                 // wait for failure notification from other engine
@@ -684,32 +692,6 @@ void QmlCppEngine::showMessage(const QString &msg, int channel, int timeout) con
     DebuggerEngine::showMessage(msg, channel, timeout);
 }
 
-void QmlCppEngine::skipCppBreakpoint()
-{
-    // only used to skip breakpoint in CPP when QML not ready yet
-    QTC_ASSERT(d->m_cppEngine->state() == InferiorStopOk, return);
-    QTC_ASSERT(d->m_qmlEngine->state() == EngineRunRequested, return);
-
-    if (!d->m_msg) {
-        Core::ICore * const core = Core::ICore::instance();
-        d->m_msg = new QMessageBox(core->mainWindow());
-    }
-
-    if (d->m_msg->isHidden()) {
-        d->m_msg->setIcon(QMessageBox::Warning);
-        d->m_msg->setWindowTitle(tr("QML/C++ Debugging"));
-        d->m_msg->setText(tr("Cannot stop execution before QML engine is started. Skipping breakpoint.\n"
-                             "Suggestions: Move the breakpoint after QmlApplicationViewer instantiation or switch to C++ only debugging."));
-        d->m_msg->setStandardButtons(QMessageBox::Ok);
-        d->m_msg->setDefaultButton(QMessageBox::Ok);
-        d->m_msg->setModal(false);
-        d->m_msg->show();
-    }
-
-    d->m_cppEngine->continueInferior();
-    resetLocation();
-}
-
 DebuggerEngine *QmlCppEngine::cppEngine() const
 {
     return d->m_cppEngine;
diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h
index 80bf87e52a..efd13590c6 100644
--- a/src/plugins/debugger/qml/qmlcppengine.h
+++ b/src/plugins/debugger/qml/qmlcppengine.h
@@ -123,9 +123,6 @@ protected:
     void notifyEngineRunAndInferiorRunOk();
     void notifyInferiorShutdownOk();
 
-protected slots:
-    void skipCppBreakpoint();
-
 private:
     void engineStateChanged(DebuggerState newState);
     void setState(DebuggerState newState, bool forced = false);
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 1bd5f363c7..89725158a5 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -133,9 +133,9 @@ public:
             args.append(arg);
         }
 
-        if (m_patience->isChecked() && m_patience->isVisible())
+        if (m_patience->isChecked())
             args.prepend(QLatin1String("--patience"));
-        if (m_ignoreSpaces->isChecked() && m_ignoreSpaces->isVisible())
+        if (m_ignoreSpaces->isChecked())
             args.prepend(QLatin1String("--ignore-space-change"));
 
         return args;
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp
index 18fa55228f..b6d1f32856 100644
--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -163,7 +163,7 @@ GLSLTextEditorWidget::GLSLTextEditorWidget(QWidget *parent) :
 
     connect(this, SIGNAL(textChanged()), this, SLOT(updateDocument()));
 
-    baseTextDocument()->setSyntaxHighlighter(new Highlighter(this, document()));
+    new Highlighter(baseTextDocument());
 
 //    if (m_modelManager) {
 //        m_semanticHighlighter->setModelManager(m_modelManager);
@@ -312,7 +312,7 @@ void GLSLTextEditorWidget::updateDocumentNow()
 {
     m_updateDocumentTimer->stop();
 
-    int variant = languageVariant();
+    int variant = languageVariant(mimeType());
     const QString contents = toPlainText(); // get the code from the editor
     const QByteArray preprocessedCode = contents.toLatin1(); // ### use the QtCreator C++ preprocessor.
 
@@ -371,10 +371,9 @@ void GLSLTextEditorWidget::updateDocumentNow()
     }
 }
 
-int GLSLTextEditorWidget::languageVariant() const
+int GLSLTextEditorWidget::languageVariant(const QString &type)
 {
     int variant = 0;
-    QString type = mimeType();
     bool isVertex = false;
     bool isFragment = false;
     bool isDesktop = false;
diff --git a/src/plugins/glsleditor/glsleditor.h b/src/plugins/glsleditor/glsleditor.h
index ba228f4c22..703569357f 100644
--- a/src/plugins/glsleditor/glsleditor.h
+++ b/src/plugins/glsleditor/glsleditor.h
@@ -100,7 +100,7 @@ public:
 
     QSet<QString> identifiers() const;
 
-    int languageVariant() const;
+    static int languageVariant(const QString &mimeType);
 
     Document::Ptr glslDocument() const;
 
diff --git a/src/plugins/glsleditor/glslhighlighter.cpp b/src/plugins/glsleditor/glslhighlighter.cpp
index 7a5cb702d8..2055ac1ffc 100644
--- a/src/plugins/glsleditor/glslhighlighter.cpp
+++ b/src/plugins/glsleditor/glslhighlighter.cpp
@@ -34,6 +34,7 @@
 #include <glsl/glsllexer.h>
 #include <glsl/glslparser.h>
 #include <texteditor/basetextdocumentlayout.h>
+#include <texteditor/basetextdocument.h>
 
 #include <QtCore/QDebug>
 
@@ -41,8 +42,8 @@ using namespace GLSLEditor;
 using namespace GLSLEditor::Internal;
 using namespace TextEditor;
 
-Highlighter::Highlighter(GLSLTextEditorWidget *editor, QTextDocument *parent)
-    : TextEditor::SyntaxHighlighter(parent), m_editor(editor)
+Highlighter::Highlighter(BaseTextDocument *parent)
+    : TextEditor::SyntaxHighlighter(parent)
 {
 }
 
@@ -72,7 +73,8 @@ void Highlighter::highlightBlock(const QString &text)
     lex.setState(state);
     lex.setScanKeywords(false);
     lex.setScanComments(true);
-    const int variant = m_editor->languageVariant();
+    const int variant =
+        GLSLTextEditorWidget::languageVariant(static_cast<BaseTextDocument*>(parent())->mimeType());
     lex.setVariant(variant);
 
     int initialState = state;
diff --git a/src/plugins/glsleditor/glslhighlighter.h b/src/plugins/glsleditor/glslhighlighter.h
index e9dc44ef7e..1d52f98d52 100644
--- a/src/plugins/glsleditor/glslhighlighter.h
+++ b/src/plugins/glsleditor/glslhighlighter.h
@@ -60,7 +60,7 @@ public:
         NumGLSLFormats
     };
 
-    explicit Highlighter(GLSLTextEditorWidget *editor, QTextDocument *parent);
+    explicit Highlighter(TextEditor::BaseTextDocument *parent);
     virtual ~Highlighter();
 
     void setFormats(const QVector<QTextCharFormat> &formats);
@@ -72,7 +72,6 @@ protected:
 
 private:
     QTextCharFormat m_formats[NumGLSLFormats];
-    GLSLTextEditorWidget *m_editor;
 };
 
 } // namespace Internal
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index a2c43fc2dc..4fbbb49541 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -261,7 +261,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
     am->actionContainer(M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
     connect(action, SIGNAL(triggered()), this, SLOT(slotOpenSupportPage()));
 
-    action = new QAction(tr("Report Bug"), this);
+    action = new QAction(tr("Report Bug..."), this);
     cmd = am->registerAction(action, Core::Id("Help.ReportBug"), globalcontext);
     am->actionContainer(M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
     connect(action, SIGNAL(triggered()), this, SLOT(slotReportBug()));
@@ -271,7 +271,6 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
     action->setSeparator(true);
     cmd = am->registerAction(action, Core::Id("Help.Separator2"), globalcontext);
     am->actionContainer(M_HELP)->addAction(cmd, Core::Constants::G_HELP_HELP);
-    connect(action, SIGNAL(triggered()), this, SLOT(activateContext()));
 #endif
 
     action = new QAction(this);
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 9cf2ea8948..6eda22eebe 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -260,7 +260,7 @@ static QString winExpandDelayedEnvReferences(QString in, const Utils::Environmen
 
 static Utils::Environment msvcReadEnvironmentSetting(const QString &varsBat,
                                                      const QString &args,
-                                                     const Utils::Environment &env)
+                                                     Utils::Environment env)
 {
     // Run the setup script and extract the variables
     Utils::Environment result = env;
@@ -286,6 +286,10 @@ static Utils::Environment msvcReadEnvironmentSetting(const QString &varsBat,
     }
 
     Utils::QtcProcess run;
+    // As of WinSDK 7.1, there is logic preventing the path from being set
+    // correctly if "ORIGINALPATH" is already set. That can cause problems
+    // if Creator is launched within a session set up by setenv.cmd.
+    env.unset(QLatin1String("ORIGINALPATH"));
     run.setEnvironment(env);
     const QString cmdPath = QString::fromLocal8Bit(qgetenv("COMSPEC"));
     // Windows SDK setup scripts require command line switches for environment expansion.
diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientlineqmladaptor.cpp b/src/plugins/qmldesigner/components/propertyeditor/gradientlineqmladaptor.cpp
index 25668cd25e..3f356ff317 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/gradientlineqmladaptor.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/gradientlineqmladaptor.cpp
@@ -85,6 +85,9 @@ void GradientLineQmlAdaptor::setupGradient()
     if (!modelNode.isValid())
         return;
 
+    if (modelNode.hasBindingProperty(gradientName()))
+        return;
+
     if (modelNode.hasProperty(gradientName())) { //gradient exists
 
         ModelNode gradientNode = modelNode.nodeProperty(gradientName()).modelNode();
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
index e55e4c466d..a4e6aa0df5 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
@@ -105,8 +105,12 @@ static void fixAmbigousColorNames(const QmlDesigner::ModelNode &modelNode, const
             && (modelNode.metaInfo().propertyTypeName(name) == "QColor"
                 || modelNode.metaInfo().propertyTypeName(name) == "color")) {
         if ((value->type() == QVariant::Color)) {
-            *value = QColor(value->value<QColor>().name());
-        } else {
+            QColor color = value->value<QColor>();
+            int alpha = color.alpha();
+            color = QColor(color.name());
+            color.setAlpha(alpha);
+            *value = color;
+        } else if (value->toString() != QLatin1String("transparent")) {
             *value = QColor(value->toString()).name();
         }
     }
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
index 924258029e..a379302902 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
+++ b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
@@ -255,7 +255,6 @@ Rectangle {
                     function unFocus() {
                         if (visible) {
                             visible=false;
-                            statesEditorModel.renameState(nodeId, stateNameInput.text);
                         }
                     }
 
diff --git a/src/plugins/qmldesigner/designercore/include/componenttextmodifier.h b/src/plugins/qmldesigner/designercore/include/componenttextmodifier.h
index fb73985681..a7145b7b41 100644
--- a/src/plugins/qmldesigner/designercore/include/componenttextmodifier.h
+++ b/src/plugins/qmldesigner/designercore/include/componenttextmodifier.h
@@ -74,6 +74,7 @@ private:
     int m_componentStartOffset;
     int m_componentEndOffset;
     int m_rootStartOffset;
+    int m_startLength;
 };
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp b/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp
index 71e6a89dc1..0655dcc942 100644
--- a/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp
+++ b/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp
@@ -39,7 +39,6 @@ ComponentTextModifier::ComponentTextModifier(TextModifier *originalModifier, int
         m_componentEndOffset(componentEndOffset),
         m_rootStartOffset(rootStartOffset)
 {
-    connect(m_originalModifier, SIGNAL(replaced(int, int, int)), this, SLOT(contentsChange(int,int,int)));
     connect(m_originalModifier, SIGNAL(textChanged()), this, SIGNAL(textChanged()));
 
     connect(m_originalModifier, SIGNAL(replaced(int, int, int)), this, SIGNAL(replaced(int, int, int)));
@@ -73,16 +72,26 @@ int ComponentTextModifier::indentDepth() const
 void ComponentTextModifier::startGroup()
 {
     m_originalModifier->startGroup();
+    m_startLength = m_originalModifier->text().length();
 }
 
 void ComponentTextModifier::flushGroup()
 {
     m_originalModifier->flushGroup();
+
+    uint textLength = m_originalModifier->text().length();
+    m_componentEndOffset += (textLength - m_startLength);
+    m_startLength = textLength;
+
 }
 
 void ComponentTextModifier::commitGroup()
 {
     m_originalModifier->commitGroup();
+
+    uint textLength = m_originalModifier->text().length();
+    m_componentEndOffset += (textLength - m_startLength);
+    m_startLength = textLength;
 }
 
 QTextDocument *ComponentTextModifier::textDocument() const
@@ -119,21 +128,8 @@ void ComponentTextModifier::reactivateChangeSignals()
     m_originalModifier->reactivateChangeSignals();
 }
 
-void ComponentTextModifier::contentsChange(int position, int charsRemoved, int charsAdded)
+void ComponentTextModifier::contentsChange(int /*position*/, int /*charsRemoved*/, int /*charsAdded*/)
 {
-    const int diff = charsAdded - charsRemoved;
-
-    if (position < m_rootStartOffset) {
-        m_rootStartOffset += diff;
-    }
-
-    if (position < m_componentStartOffset) {
-        m_componentStartOffset += diff;
-    }
-
-    if (position < m_componentEndOffset) {
-        m_componentEndOffset += diff;
-    }
 }
 
 QmlJS::Snapshot ComponentTextModifier::getSnapshot() const
diff --git a/src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp b/src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
index 279c9aae06..0333b5e4fc 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
@@ -32,6 +32,7 @@
 
 #include "modelnodecontextmenu.h"
 #include <QApplication>
+#include <QMessageBox>
 #include <coreplugin/editormanager/editormanager.h>
 #include <nodeabstractproperty.h>
 #include <nodelistproperty.h>
@@ -40,6 +41,7 @@
 #include <qmlitemnode.h>
 #include <variantproperty.h>
 #include <nodeproperty.h>
+#include <rewritingexception.h>
 #include <rewritertransaction.h>
 #include <designdocumentcontroller.h>
 
@@ -67,6 +69,11 @@ static inline bool checkIfNodeIsAView(const ModelNode &node)
              node.metaInfo().isSubclassOf("QtQuick.PathView", -1, -1));
 }
 
+static inline bool isItem(const ModelNode &node)
+{
+    return node.metaInfo().isValid() && node.metaInfo().isSubclassOf("QtQuick.Item", -1, -1);
+}
+
 static inline QList<QmlItemNode> siblingsForNode(const QmlItemNode &itemNode)
 {
     QList<QmlItemNode> siblingList;
@@ -242,7 +249,10 @@ void ModelNodeContextMenu::execute(const QPoint &pos, bool selectionMenuBool)
         if (!modelNodesHaveProperty(selectedModelNodes, QLatin1String("width")) && !modelNodesHaveProperty(selectedModelNodes, QLatin1String("height")))
             action->setDisabled(true);
         editMenu->addAction(action);
-        editMenu->addAction(createModelNodeAction(tr("Visibility"), editMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::ModelNodeVisibility, singleSelected));
+        action = createModelNodeAction(tr("Visibility"), editMenu, QList<ModelNode>() << currentSingleNode, ModelNodeAction::ModelNodeVisibility, singleSelected);
+        editMenu->addAction(action);
+        if (!isItem(currentSingleNode))
+            action->setDisabled(true);
 
     } else {
         editMenu->setEnabled(false);
@@ -358,11 +368,15 @@ void ModelNodeAction::toFront()
     if (!m_view)
         return;
 
-    QmlItemNode node = m_modelNodeList.first();
-    if (node.isValid()) {
-        signed int maximumZ = getMaxZValue(siblingsForNode(node));
-        maximumZ++;
-        node.setVariantProperty("z", maximumZ);
+    try {
+        QmlItemNode node = m_modelNodeList.first();
+        if (node.isValid()) {
+            signed int maximumZ = getMaxZValue(siblingsForNode(node));
+            maximumZ++;
+            node.setVariantProperty("z", maximumZ);
+        }
+    } catch (RewritingException &e) { //better save then sorry
+        QMessageBox::warning(0, "Error", e.description());
     }
 }
 
@@ -371,12 +385,16 @@ void ModelNodeAction::toBack()
 {
     if (!m_view)
         return;
+    try {
+        QmlItemNode node = m_modelNodeList.first();
+        if (node.isValid()) {
+            signed int minimumZ = getMinZValue(siblingsForNode(node));
+            minimumZ--;
+            node.setVariantProperty("z", minimumZ);
+        }
 
-    QmlItemNode node = m_modelNodeList.first();
-    if (node.isValid()) {
-        signed int minimumZ = getMinZValue(siblingsForNode(node));
-        minimumZ--;
-        node.setVariantProperty("z", minimumZ);
+    } catch (RewritingException &e) { //better save then sorry
+        QMessageBox::warning(0, "Error", e.description());
     }
 }
 
@@ -385,14 +403,18 @@ void ModelNodeAction::raise()
     if (!m_view)
         return;
 
-    RewriterTransaction(m_view);
-    foreach (ModelNode modelNode, m_modelNodeList) {
-        QmlItemNode node = modelNode;
-        if (node.isValid()) {
-            signed int z  = node.instanceValue("z").toInt();
-            z++;
-            node.setVariantProperty("z", z);
+    try {
+        RewriterTransaction(m_view);
+        foreach (ModelNode modelNode, m_modelNodeList) {
+            QmlItemNode node = modelNode;
+            if (node.isValid()) {
+                signed int z  = node.instanceValue("z").toInt();
+                z++;
+                node.setVariantProperty("z", z);
+            }
         }
+    } catch (RewritingException &e) { //better save then sorry
+         QMessageBox::warning(0, "Error", e.description());
     }
 }
 
@@ -400,15 +422,18 @@ void ModelNodeAction::lower()
 {
     if (!m_view)
         return;
-
-    RewriterTransaction(m_view);
-    foreach (ModelNode modelNode, m_modelNodeList) {
-        QmlItemNode node = modelNode;
-        if (node.isValid()) {
-            signed int z  = node.instanceValue("z").toInt();
-            z--;
-            node.setVariantProperty("z", z);
+    try {
+        RewriterTransaction(m_view);
+        foreach (ModelNode modelNode, m_modelNodeList) {
+            QmlItemNode node = modelNode;
+            if (node.isValid()) {
+                signed int z  = node.instanceValue("z").toInt();
+                z--;
+                node.setVariantProperty("z", z);
+            }
         }
+    } catch (RewritingException &e) { //better save then sorry
+        QMessageBox::warning(0, "Error", e.description());
     }
 }
 
@@ -426,7 +451,13 @@ void ModelNodeAction::redo()
 
 void ModelNodeAction::setVisible(bool b)
 {
-    m_modelNodeList.first().variantProperty("visible") = b;
+    if (!m_view)
+        return;
+    try {
+        m_modelNodeList.first().variantProperty("visible") = b;
+    } catch (RewritingException &e) { //better save then sorry
+        QMessageBox::warning(0, "Error", e.description());
+    }
 }
 
 
@@ -434,11 +465,14 @@ void ModelNodeAction::resetSize()
 {
     if (!m_view)
         return;
-
-    RewriterTransaction(m_view);
-    foreach (ModelNode node, m_modelNodeList) {
-        node.removeProperty("width");
-        node.removeProperty("height");
+    try {
+        RewriterTransaction(m_view);
+        foreach (ModelNode node, m_modelNodeList) {
+            node.removeProperty("width");
+            node.removeProperty("height");
+        }
+    } catch (RewritingException &e) { //better save then sorry
+        QMessageBox::warning(0, "Error", e.description());
     }
 }
 
@@ -446,11 +480,14 @@ void ModelNodeAction::resetPosition()
 {
     if (!m_view)
         return;
-
-    RewriterTransaction(m_view);
-    foreach (ModelNode node, m_modelNodeList) {
-        node.removeProperty("x");
-        node.removeProperty("y");
+    try {
+        RewriterTransaction(m_view);
+        foreach (ModelNode node, m_modelNodeList) {
+            node.removeProperty("x");
+            node.removeProperty("y");
+        }
+    } catch (RewritingException &e) { //better save then sorry
+        QMessageBox::warning(0, "Error", e.description());
     }
 }
 
diff --git a/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
index fd237aaa13..c5880e5037 100644
--- a/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
+++ b/src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
@@ -93,6 +93,17 @@ void PlainTextEditModifier::replace(int offset, int length, const QString &repla
 
 void PlainTextEditModifier::move(const MoveInfo &moveInfo)
 {
+#if 0
+    qDebug() << "Original:"    << m_textEdit->toPlainText();
+    qDebug() << "Move:" << m_textEdit->toPlainText().mid(moveInfo.objectStart, moveInfo.objectEnd - moveInfo.objectStart);
+    qDebug() << "     prefix:" << moveInfo.prefixToInsert;
+    qDebug() << "     suffix:" <<  moveInfo.suffixToInsert;
+    qDebug() << "     leadingCharsToRemove:" <<  moveInfo.leadingCharsToRemove;
+    qDebug() << "                          " <<  m_textEdit->toPlainText().mid(moveInfo.objectStart - moveInfo.leadingCharsToRemove,  moveInfo.leadingCharsToRemove);
+    qDebug() << "     trailingCharsToRemove:" <<  moveInfo.trailingCharsToRemove;
+    qDebug() << "                           " <<  m_textEdit->toPlainText().mid(moveInfo.objectEnd, moveInfo.trailingCharsToRemove);
+#endif
+
     Q_ASSERT(moveInfo.objectStart >= 0);
     Q_ASSERT(moveInfo.objectEnd > moveInfo.objectStart);
     Q_ASSERT(moveInfo.destination >= 0);
diff --git a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
index 0a299778c0..2c3d115768 100644
--- a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
@@ -54,6 +54,14 @@ inline static QString properColorName(const QColor &color)
     return s;
 }
 
+inline static QString doubleToString(double d)
+{
+    QString string = QString::number(d, 'f', 3);
+    if (string.endsWith(".000"))
+        string.chop(4);
+    return string;
+}
+
 QmlTextGenerator::QmlTextGenerator(const QStringList &propertyOrder, int indentDepth):
         m_propertyOrder(propertyOrder),
         m_indentDepth(indentDepth)
@@ -116,7 +124,7 @@ QString QmlTextGenerator::toQml(const AbstractProperty &property, int indentDept
                 return QString(QLatin1String("\"%1\"")).arg(properColorName(value.value<QColor>()));
 
             case QVariant::Double:
-                return QString::number(value.toDouble(), 'f', 3);
+                return doubleToString(value.toDouble());
             case QVariant::Int:
             case QVariant::LongLong:
             case QVariant::UInt:
diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
index 931afd81a2..2f9a1d2bae 100644
--- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp
@@ -318,7 +318,8 @@ void QmlProfilerEngine::wrongSetupMessageBoxFinished(int button)
 {
     if (button == QMessageBox::Help) {
         Core::HelpManager *helpManager = Core::HelpManager::instance();
-        helpManager->handleHelpRequest("qthelp://com.nokia.qtcreator/doc/creator-qml-performance-monitor.html");
+        helpManager->handleHelpRequest("qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html"
+                               "#setting-up-qml-debugging");
     }
 }
 
diff --git a/src/plugins/qmlprofiler/qmlprofilereventview.cpp b/src/plugins/qmlprofiler/qmlprofilereventview.cpp
index aa97693774..28de7cb49e 100644
--- a/src/plugins/qmlprofiler/qmlprofilereventview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilereventview.cpp
@@ -450,7 +450,7 @@ void QmlProfilerEventsView::QmlProfilerEventsViewPrivate::buildModelFromList( co
 
         if (m_fieldShown[Type]) {
             newRow << new EventsViewItem(nameForType(binding->eventType));
-            newRow.last()->setData(QVariant(binding->eventType));
+            newRow.last()->setData(QVariant(nameForType(binding->eventType)));
         }
 
         if (m_fieldShown[Percent]) {
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index ff33b08d93..d65048a641 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -147,8 +147,9 @@ void QmlProject::refresh(RefreshOptions options)
     if (activeTarget()) {
         if (QmlProjectRunConfiguration *rc = qobject_cast<QmlProjectRunConfiguration *>(activeTarget()->activeRunConfiguration()))
             version = rc->qtVersion();
-        QList<ProjectExplorer::ToolChain *> tcList
-                = ProjectExplorer::ToolChainManager::instance()->findToolChains(version->qtAbis().at(0));
+        QList<ProjectExplorer::ToolChain *> tcList;
+        if (version && !version->qtAbis().isEmpty())
+              tcList = ProjectExplorer::ToolChainManager::instance()->findToolChains(version->qtAbis().at(0));
         if (tcList.isEmpty())
             return;
         QtSupport::QmlDumpTool::pathAndEnvironment(this, version, tcList.first(), false, &pinfo.qmlDumpPath, &pinfo.qmlDumpEnvironment);
diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
index a72b8c91ed..01aadc0671 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
@@ -217,6 +217,13 @@ RunControl *QmlProjectRunControlFactory::createDebugRunControl(QmlProjectRunConf
     params.projectSourceDirectory = runConfig->target()->project()->projectDirectory();
     params.projectSourceFiles = runConfig->target()->project()->files(Project::ExcludeGeneratedFiles);
 
+    // Makes sure that all bindings go through the JavaScript engine, so that
+    // breakpoints are actually hit!
+    const QString optimizerKey = QLatin1String("QML_DISABLE_OPTIMIZER");
+    if (!params.environment.hasKey(optimizerKey)) {
+        params.environment.set(optimizerKey, QLatin1String("1"));
+    }
+
     if (params.executable.isEmpty()) {
         QmlProjectPlugin::showQmlObserverToolWarning();
         return 0;
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
index b6448213c4..7dabc385ea 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
@@ -460,7 +460,7 @@ QString QtQuickApp::componentSetDir(ComponentSet componentSet) const
     }
 }
 
-const int QtQuickApp::StubVersion = 13;
+const int QtQuickApp::StubVersion = 14;
 
 } // namespace Internal
 } // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index 03bcc7e408..047eb9699e 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -96,6 +96,10 @@ bool QtQuickAppWizardDialog::validateCurrentPage()
             QSet<QString> requiredFeatures;
             requiredFeatures << Constants::QTQUICKCOMPONENTS_MEEGO_TARGETFEATURE_ID;
             targetsPage()->setRequiredFeatures(requiredFeatures);
+        } else {
+            targetsPage()->setMinimumQtVersion(QtSupport::QtVersionNumber(4, 7, 0));
+            QSet<QString> requiredFeatures;
+            targetsPage()->setRequiredFeatures(requiredFeatures);
         }
     }
     return AbstractMobileAppWizardDialog::validateCurrentPage();
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui b/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
index e6b49b95d3..7060391129 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
+++ b/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
@@ -79,7 +79,11 @@
          </spacer>
         </item>
         <item>
-         <widget class="Utils::PathChooser" name="importLineEdit"/>
+         <widget class="Utils::PathChooser" name="importLineEdit">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+         </widget>
         </item>
        </layout>
       </item>
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index 6c8878a158..b22be437ca 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -200,7 +200,6 @@ bool QtVersionManager::restoreQtVersions()
 
 void QtVersionManager::updateFromInstaller()
 {
-    bool debug = true;
     ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
     QList<QtVersionFactory *> factories = pm->getObjects<QtVersionFactory>();
     ProjectExplorer::PersistentSettingsReader reader;
diff --git a/src/plugins/remotelinux/maemopackagecreationstep.cpp b/src/plugins/remotelinux/maemopackagecreationstep.cpp
index b483e4e326..52e9e8fce4 100644
--- a/src/plugins/remotelinux/maemopackagecreationstep.cpp
+++ b/src/plugins/remotelinux/maemopackagecreationstep.cpp
@@ -233,10 +233,14 @@ void AbstractMaemoPackageCreationStep::preparePackagingProcess(QProcess *proc,
     proc->setWorkingDirectory(workingDir);
 }
 
-QString AbstractMaemoPackageCreationStep::replaceDots(const QString &name)
+QString AbstractMaemoPackageCreationStep::replaceDots(const QString &name) const
 {
-    QString adaptedName = name;
-    return adaptedName.replace(QLatin1Char('.'), QLatin1Char('_'));
+    // Idiotic OVI store requirement for N900 (but not allowed for N9 ...).
+    if (qobject_cast<Qt4Maemo5Target *>(target())) {
+        QString adaptedName = name;
+        return adaptedName.replace(QLatin1Char('.'), QLatin1Char('_'));
+    }
+    return name;
 }
 
 
diff --git a/src/plugins/remotelinux/maemopackagecreationstep.h b/src/plugins/remotelinux/maemopackagecreationstep.h
index 54d0fdd4da..1f11ab88ee 100644
--- a/src/plugins/remotelinux/maemopackagecreationstep.h
+++ b/src/plugins/remotelinux/maemopackagecreationstep.h
@@ -78,7 +78,7 @@ protected:
                              AbstractMaemoPackageCreationStep *other);
 
     bool callPackagingCommand(QProcess *proc, const QStringList &arguments);
-    static QString replaceDots(const QString &name);
+    QString replaceDots(const QString &name) const;
 
 private slots:
     void handleBuildOutput();
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index ddd30dfe8f..85193ef383 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -145,6 +145,9 @@ protected:
     void leaveEvent(QEvent *event){
         textEdit->extraAreaLeaveEvent(event);
     }
+    void contextMenuEvent(QContextMenuEvent *event) {
+        textEdit->extraAreaContextMenuEvent(event);
+    }
 
     void wheelEvent(QWheelEvent *event) {
         QCoreApplication::sendEvent(textEdit->viewport(), event);
@@ -4210,6 +4213,19 @@ void BaseTextEditorWidget::extraAreaLeaveEvent(QEvent *)
     extraAreaMouseEvent(&me);
 }
 
+void BaseTextEditorWidget::extraAreaContextMenuEvent(QContextMenuEvent *e)
+{
+    QTextCursor cursor = cursorForPosition(QPoint(0, e->pos().y()));
+    if (d->m_marksVisible) {
+        QMenu * contextMenu = new QMenu(this);
+        emit editor()->markContextMenuRequested(editor(), cursor.blockNumber() + 1, contextMenu);
+        if (!contextMenu->isEmpty())
+            contextMenu->exec(e->globalPos());
+        delete contextMenu;
+        e->accept();
+    }
+}
+
 void BaseTextEditorWidget::extraAreaMouseEvent(QMouseEvent *e)
 {
     QTextCursor cursor = cursorForPosition(QPoint(0, e->pos().y()));
@@ -4266,13 +4282,6 @@ void BaseTextEditorWidget::extraAreaMouseEvent(QMouseEvent *e)
             } else {
                 d->extraAreaToggleMarkBlockNumber = cursor.blockNumber();
             }
-        } else if (d->m_marksVisible && e->button() == Qt::RightButton) {
-            QMenu * contextMenu = new QMenu(this);
-            emit editor()->markContextMenuRequested(editor(), cursor.blockNumber() + 1, contextMenu);
-            if (!contextMenu->isEmpty())
-                contextMenu->exec(e->globalPos());
-            delete contextMenu;
-            e->accept();
         }
     } else if (d->extraAreaSelectionAnchorBlockNumber >= 0) {
         QTextCursor selection = cursor;
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index a163daa1a8..c0f71474b8 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -372,6 +372,7 @@ public:
     virtual int extraAreaWidth(int *markWidthPtr = 0) const;
     virtual void extraAreaPaintEvent(QPaintEvent *);
     virtual void extraAreaLeaveEvent(QEvent *);
+    virtual void extraAreaContextMenuEvent(QContextMenuEvent *);
     virtual void extraAreaMouseEvent(QMouseEvent *);
 
     const TabSettings &tabSettings() const;
diff --git a/src/plugins/texteditor/syntaxhighlighter.cpp b/src/plugins/texteditor/syntaxhighlighter.cpp
index 3dfe2b9a11..f10b203786 100644
--- a/src/plugins/texteditor/syntaxhighlighter.cpp
+++ b/src/plugins/texteditor/syntaxhighlighter.cpp
@@ -30,6 +30,7 @@
 **************************************************************************/
 
 #include "syntaxhighlighter.h"
+#include "basetextdocument.h"
 
 #include <qtextdocument.h>
 #include <qtextlayout.h>
@@ -324,6 +325,13 @@ SyntaxHighlighter::SyntaxHighlighter(QTextDocument *parent)
     setDocument(parent);
 }
 
+SyntaxHighlighter::SyntaxHighlighter(BaseTextDocument *parent)
+    : d_ptr(new SyntaxHighlighterPrivate)
+{
+    d_ptr->q_ptr = this;
+    parent->setSyntaxHighlighter(this); // Extra logic (including setting the parent).
+}
+
 /*!
     Constructs a SyntaxHighlighter and installs it on \a parent 's
     QTextDocument. The specified QTextEdit also becomes the owner of
diff --git a/src/plugins/texteditor/syntaxhighlighter.h b/src/plugins/texteditor/syntaxhighlighter.h
index 7aa6b5fb94..70ecdfeb8b 100644
--- a/src/plugins/texteditor/syntaxhighlighter.h
+++ b/src/plugins/texteditor/syntaxhighlighter.h
@@ -49,6 +49,7 @@ QT_END_NAMESPACE
 
 namespace TextEditor {
 
+class BaseTextDocument;
 class SyntaxHighlighterPrivate;
 
 class TEXTEDITOR_EXPORT SyntaxHighlighter : public QObject
@@ -58,6 +59,7 @@ class TEXTEDITOR_EXPORT SyntaxHighlighter : public QObject
 public:
     SyntaxHighlighter(QObject *parent);
     SyntaxHighlighter(QTextDocument *parent);
+    SyntaxHighlighter(BaseTextDocument *parent);
     SyntaxHighlighter(QTextEdit *parent);
     virtual ~SyntaxHighlighter();
 
diff --git a/src/plugins/valgrind/valgrindconfigwidget.cpp b/src/plugins/valgrind/valgrindconfigwidget.cpp
index 337b786c83..128282a92f 100644
--- a/src/plugins/valgrind/valgrindconfigwidget.cpp
+++ b/src/plugins/valgrind/valgrindconfigwidget.cpp
@@ -54,11 +54,14 @@ ValgrindConfigWidget::ValgrindConfigWidget(ValgrindBaseSettings *settings,
       m_ui(new Ui::ValgrindConfigWidget)
 {
     m_ui->setupUi(this);
+    m_model = new QStandardItemModel(this);
 
     m_ui->valgrindExeChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
     m_ui->valgrindExeChooser->setPromptDialogTitle(tr("Valgrind Command"));
 
-    m_ui->valgrindExeChooser->setPath(m_settings->valgrindExecutable());
+    updateUi();
+    connect(m_settings, SIGNAL(changed()), this, SLOT(updateUi()));
+
     connect(m_ui->valgrindExeChooser, SIGNAL(changed(QString)),
             m_settings, SLOT(setValgrindExecutable(QString)));
     connect(m_settings, SIGNAL(valgrindExecutableChanged(QString)),
@@ -74,43 +77,36 @@ ValgrindConfigWidget::ValgrindConfigWidget(ValgrindBaseSettings *settings,
     //
     // Callgrind
     //
-    m_ui->enableCacheSim->setChecked(m_settings->enableCacheSim());
     connect(m_ui->enableCacheSim, SIGNAL(toggled(bool)),
             m_settings, SLOT(setEnableCacheSim(bool)));
     connect(m_settings, SIGNAL(enableCacheSimChanged(bool)),
             m_ui->enableCacheSim, SLOT(setChecked(bool)));
 
-    m_ui->enableBranchSim->setChecked(m_settings->enableBranchSim());
     connect(m_ui->enableBranchSim, SIGNAL(toggled(bool)),
             m_settings, SLOT(setEnableBranchSim(bool)));
     connect(m_settings, SIGNAL(enableBranchSimChanged(bool)),
             m_ui->enableBranchSim, SLOT(setChecked(bool)));
 
-    m_ui->collectSystime->setChecked(m_settings->collectSystime());
     connect(m_ui->collectSystime, SIGNAL(toggled(bool)),
             m_settings, SLOT(setCollectSystime(bool)));
     connect(m_settings, SIGNAL(collectSystimeChanged(bool)),
             m_ui->collectSystime, SLOT(setChecked(bool)));
 
-    m_ui->collectBusEvents->setChecked(m_settings->collectBusEvents());
     connect(m_ui->collectBusEvents, SIGNAL(toggled(bool)),
             m_settings, SLOT(setCollectBusEvents(bool)));
     connect(m_settings, SIGNAL(collectBusEventsChanged(bool)),
             m_ui->collectBusEvents, SLOT(setChecked(bool)));
 
-    m_ui->enableEventToolTips->setChecked(m_settings->enableEventToolTips());
     connect(m_ui->enableEventToolTips, SIGNAL(toggled(bool)),
             m_settings, SLOT(setEnableEventToolTips(bool)));
     connect(m_settings, SIGNAL(enableEventToolTipsChanged(bool)),
             m_ui->enableEventToolTips, SLOT(setChecked(bool)));
 
-    m_ui->minimumInclusiveCostRatio->setValue(m_settings->minimumInclusiveCostRatio());
     connect(m_ui->minimumInclusiveCostRatio, SIGNAL(valueChanged(double)),
             m_settings, SLOT(setMinimumInclusiveCostRatio(double)));
     connect(m_settings, SIGNAL(minimumInclusiveCostRatioChanged(double)),
             m_ui->minimumInclusiveCostRatio, SLOT(setValue(double)));
 
-    m_ui->visualisationMinimumInclusiveCostRatio->setValue(m_settings->visualisationMinimumInclusiveCostRatio());
     connect(m_ui->visualisationMinimumInclusiveCostRatio, SIGNAL(valueChanged(double)),
             m_settings, SLOT(setVisualisationMinimumInclusiveCostRatio(double)));
     connect(m_settings, SIGNAL(visualisationMinimumInclusiveCostRatioChanged(double)),
@@ -119,8 +115,6 @@ ValgrindConfigWidget::ValgrindConfigWidget(ValgrindBaseSettings *settings,
     //
     // Memcheck
     //
-    m_model = new QStandardItemModel(this);
-
     m_ui->suppressionList->setModel(m_model);
     m_ui->suppressionList->setSelectionMode(QAbstractItemView::MultiSelection);
 
@@ -129,11 +123,9 @@ ValgrindConfigWidget::ValgrindConfigWidget(ValgrindBaseSettings *settings,
     connect(m_ui->removeSuppression, SIGNAL(clicked()),
             this, SLOT(slotRemoveSuppression()));
 
-    m_ui->numCallers->setValue(m_settings->numCallers());
     connect(m_ui->numCallers, SIGNAL(valueChanged(int)), m_settings, SLOT(setNumCallers(int)));
     connect(m_settings, SIGNAL(numCallersChanged(int)), m_ui->numCallers, SLOT(setValue(int)));
 
-    m_ui->trackOrigins->setChecked(m_settings->trackOrigins());
     connect(m_ui->trackOrigins, SIGNAL(toggled(bool)),
             m_settings, SLOT(setTrackOrigins(bool)));
     connect(m_settings, SIGNAL(trackOriginsChanged(bool)),
@@ -144,10 +136,6 @@ ValgrindConfigWidget::ValgrindConfigWidget(ValgrindBaseSettings *settings,
     connect(m_settings, SIGNAL(suppressionFilesAdded(QStringList)),
             this, SLOT(slotSuppressionsAdded(QStringList)));
 
-    m_model->clear();
-    foreach (const QString &file, m_settings->suppressionFiles())
-        m_model->appendRow(new QStandardItem(file));
-
     connect(m_ui->suppressionList->selectionModel(),
             SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
             this, SLOT(slotSuppressionSelectionChanged()));
@@ -169,6 +157,23 @@ ValgrindConfigWidget::~ValgrindConfigWidget()
     delete m_ui;
 }
 
+void ValgrindConfigWidget::updateUi()
+{
+    m_ui->valgrindExeChooser->setPath(m_settings->valgrindExecutable());
+    m_ui->enableCacheSim->setChecked(m_settings->enableCacheSim());
+    m_ui->enableBranchSim->setChecked(m_settings->enableBranchSim());
+    m_ui->collectSystime->setChecked(m_settings->collectSystime());
+    m_ui->collectBusEvents->setChecked(m_settings->collectBusEvents());
+    m_ui->enableEventToolTips->setChecked(m_settings->enableEventToolTips());
+    m_ui->minimumInclusiveCostRatio->setValue(m_settings->minimumInclusiveCostRatio());
+    m_ui->visualisationMinimumInclusiveCostRatio->setValue(m_settings->visualisationMinimumInclusiveCostRatio());
+    m_ui->numCallers->setValue(m_settings->numCallers());
+    m_ui->trackOrigins->setChecked(m_settings->trackOrigins());
+    m_model->clear();
+    foreach (const QString &file, m_settings->suppressionFiles())
+        m_model->appendRow(new QStandardItem(file));
+}
+
 void ValgrindConfigWidget::slotAddSuppression()
 {
     QFileDialog dialog;
diff --git a/src/plugins/valgrind/valgrindconfigwidget.h b/src/plugins/valgrind/valgrindconfigwidget.h
index 948e87ff96..3ecb8ea1e5 100644
--- a/src/plugins/valgrind/valgrindconfigwidget.h
+++ b/src/plugins/valgrind/valgrindconfigwidget.h
@@ -68,6 +68,9 @@ public Q_SLOTS:
     void slotSuppressionsAdded(const QStringList &files);
     void slotSuppressionSelectionChanged();
 
+private slots:
+    void updateUi();
+
 private:
     ValgrindBaseSettings *m_settings;
     Ui::ValgrindConfigWidget *m_ui;
diff --git a/src/plugins/valgrind/valgrindsettings.cpp b/src/plugins/valgrind/valgrindsettings.cpp
index e7aebe873b..53c63c1075 100644
--- a/src/plugins/valgrind/valgrindsettings.cpp
+++ b/src/plugins/valgrind/valgrindsettings.cpp
@@ -131,6 +131,7 @@ bool ValgrindBaseSettings::fromMap(const QVariantMap &map)
     setIfPresent(map, QLatin1String(callgrindVisualisationMinimumCostRatioC),
                  &m_visualisationMinimumInclusiveCostRatio);
 
+    emit changed();
     return true;
 }
 
diff --git a/src/plugins/valgrind/valgrindsettings.h b/src/plugins/valgrind/valgrindsettings.h
index 347228e87a..49f6f18d8e 100644
--- a/src/plugins/valgrind/valgrindsettings.h
+++ b/src/plugins/valgrind/valgrindsettings.h
@@ -62,6 +62,9 @@ public:
     virtual QString id() const;
     virtual QString displayName() const;
 
+signals:
+    void changed(); // sent when multiple values have changed simulatenously (e.g. fromMap)
+
 /**
  * Base valgrind settings
  */
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index 85b40f286e..9be13f2b0b 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -53,6 +53,8 @@
 #include <QtGui/QPainter>
 #include <QtGui/QHBoxLayout>
 
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
 #include <QtCore/QSettings>
 #include <QtCore/QDebug>
 #include <QtCore/QUrl>
@@ -224,7 +226,13 @@ void WelcomeMode::initPlugins()
     if (!debug)
         engine->setOutputWarningsToStandardError(false);
     engine->setNetworkAccessManagerFactory(new NetworkAccessManagerFactory);
-    engine->addImportPath(Core::ICore::instance()->resourcePath() + "/welcomescreen");
+    QString pluginPath = QCoreApplication::applicationDirPath();
+#ifdef Q_OS_MAC
+    pluginPath += QLatin1String("/../PlugIns");
+#else
+    pluginPath += QLatin1String("/../" IDE_LIBRARY_BASENAME "/qtcreator");
+#endif
+    engine->addImportPath(QDir::cleanPath(pluginPath));
     facilitateQml(engine);
     foreach (Utils::IWelcomePage *plugin, plugins) {
         plugin->facilitateQml(engine);