diff options
Diffstat (limited to 'share/qtcreator')
7 files changed, 33 insertions, 8 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp index af240f47bf..1999f587bd 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp @@ -97,12 +97,15 @@ bool Qt5InformationNodeInstanceServer::isDirtyRecursiveForNonInstanceItems(QQuic return true; foreach (QQuickItem *childItem, item->childItems()) { - if (!hasInstanceForObject(childItem) && DesignerSupport::isDirty(childItem, informationsDirty)) - return true; + if (!hasInstanceForObject(childItem)) { + if (DesignerSupport::isDirty(childItem, informationsDirty)) + return true; + else if (isDirtyRecursiveForNonInstanceItems(childItem)) + return true; + } } return false; - } void Qt5InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands() diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp index 6fc349f186..343b90265a 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp @@ -34,6 +34,9 @@ #include <qt5nodeinstanceclientproxy.h> +#include <QQmlComponent> +#include <QQmlEngine> + #ifdef ENABLE_QT_BREAKPAD #include <qtsystemexceptionhandler.h> #endif @@ -51,6 +54,25 @@ int main(int argc, char *argv[]) QCoreApplication::setApplicationName("Qml2Puppet"); QCoreApplication::setApplicationVersion("1.0.0"); + if (application.arguments().count() == 2 && application.arguments().at(1) == "--test") { + qDebug() << QCoreApplication::applicationVersion(); + QQmlEngine engine; + + QQmlComponent component(&engine); + component.setData("import QtQuick 2.0\nItem {\n}\n", QUrl::fromLocalFile("test.qml")); + + QObject *object = component.create(); + + if (object) { + qDebug() << "Basic QtQuick 2.0 working..."; + } else { + qDebug() << "Basic QtQuick 2.0 not working..."; + qDebug() << component.errorString(); + } + delete object; + return 0; + } + if (application.arguments().count() == 2 && application.arguments().at(1) == "--version") { qDebug() << QCoreApplication::applicationVersion(); return 0; diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/BorderImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/QtQuick/BorderImageSpecifics.qml index c671e3eb64..3488e61f9d 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/BorderImageSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/QtQuick/BorderImageSpecifics.qml @@ -61,7 +61,7 @@ QWidget { backendValues.source.value = fileName; } itemNode: anchorBackend.itemNode - filter: "*.png *.gif *.jpg *.bmp *.jpeg" + filter: "*.png *.gif *.jpg *.bmp *.jpeg *.svg" showComboBox: true } } diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ImageSpecifics.qml index 04a9b9b420..835c698934 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ImageSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ImageSpecifics.qml @@ -59,7 +59,7 @@ QWidget { backendValues.source.value = fileName; } itemNode: anchorBackend.itemNode - filter: "*.png *.gif *.jpg *.bmp *.jpeg" + filter: "*.png *.gif *.jpg *.bmp *.jpeg *.svg" showComboBox: true } } diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro index 891708b00f..4ae6ec1754 100644 --- a/share/qtcreator/static.pro +++ b/share/qtcreator/static.pro @@ -2,7 +2,7 @@ include(../../qtcreator.pri) TEMPLATE = app TARGET = phony_target -CONFIG -= qt separate_debug_info gdb_dwarf_index +CONFIG -= qt sdk separate_debug_info gdb_dwarf_index QT = LIBS = macx:CONFIG -= app_bundle diff --git a/share/qtcreator/templates/qml/qtquickcontrols/main.qml b/share/qtcreator/templates/qml/qtquickcontrols/main.qml index 67a9861278..23c924f3ec 100644 --- a/share/qtcreator/templates/qml/qtquickcontrols/main.qml +++ b/share/qtcreator/templates/qml/qtquickcontrols/main.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Window 2.0 diff --git a/share/qtcreator/translations/translations.pro b/share/qtcreator/translations/translations.pro index 9ed907bd6f..547f7557a9 100644 --- a/share/qtcreator/translations/translations.pro +++ b/share/qtcreator/translations/translations.pro @@ -98,7 +98,7 @@ QMAKE_EXTRA_TARGETS += ts TEMPLATE = app TARGET = phony_target2 -CONFIG -= qt separate_debug_info gdb_dwarf_index +CONFIG -= qt sdk separate_debug_info gdb_dwarf_index QT = LIBS = |