diff options
Diffstat (limited to 'src/plugins/qmldesigner')
8 files changed, 12 insertions, 29 deletions
diff --git a/src/plugins/qmldesigner/QmlDesigner.pluginspec b/src/plugins/qmldesigner/QmlDesigner.pluginspec index 2f59fbd374..5660deede3 100644 --- a/src/plugins/qmldesigner/QmlDesigner.pluginspec +++ b/src/plugins/qmldesigner/QmlDesigner.pluginspec @@ -1,4 +1,4 @@ -<plugin name="QmlDesigner" version="2.0.80" compatVersion="2.0.80" experimental="true"> +<plugin name="QmlDesigner" version="2.1.0" compatVersion="2.1.0" experimental="true"> <vendor>Nokia Corporation</vendor> <copyright>(C) 2010 Nokia Corporation</copyright> <license> @@ -20,8 +20,8 @@ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license> <description>Visual Designer for QML files.</description> <url>http://qt.nokia.com</url> <dependencyList> - <dependency name="Core" version="2.0.80"/> - <dependency name="TextEditor" version="2.0.80"/> - <dependency name="QmlJSEditor" version="2.0.80"/> + <dependency name="Core" version="2.1.0"/> + <dependency name="TextEditor" version="2.1.0"/> + <dependency name="QmlJSEditor" version="2.1.0"/> </dependencyList> </plugin> diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp index 10287437a0..342bc7ee5d 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp @@ -65,7 +65,7 @@ FormEditorScene::FormEditorScene(FormEditorWidget *view, FormEditorView *editorV m_manipulatorLayerItem->setZValue(1.0); m_formLayerItem->setZValue(0.0); - m_formLayerItem->setFlag(QGraphicsItem::ItemClipsChildrenToShape, true); + m_formLayerItem->setFlag(QGraphicsItem::ItemClipsChildrenToShape, false); view->setScene(this); setItemIndexMethod(QGraphicsScene::NoIndex); diff --git a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp index 1672e9947f..9a444be309 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp @@ -106,7 +106,7 @@ void CustomDragAndDropIcon::mouseMoveEvent(QMouseEvent *event) else { move(-1000, -1000); //if no top level widget is found we are out of the main window } - QWidget* target = QApplication::widgetAt(globalPos - QPoint(2,2)); //-(2, 2) because: + QWidget* target = QApplication::widgetAt(globalPos - QPoint(3,3)); //-(3, 3) because: // otherwise we just get this widget if (target != m_oldTarget) { if (CustomDragAndDrop::isAccepted()) diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp index 839a3b2138..e5c86aa385 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp @@ -123,7 +123,7 @@ class QWidgetDeclarativeUI : public QObject Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged) Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged) - Q_PROPERTY(QUrl styleSheetFile READ styleSheetFile WRITE setStyleSheetFile NOTIFY styleSheetFileChanged) + Q_PROPERTY(QUrl styleSheetFile READ styleSheetFile WRITE setStyleSheetFile) Q_PROPERTY(QColor windowColor READ windowColor WRITE setWindowColor) Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor) @@ -782,7 +782,7 @@ private: class QComboBoxDeclarativeUI : public QObject { Q_OBJECT - Q_PROPERTY(QStringList items READ items WRITE setItems NOTIFY itemChanged) + Q_PROPERTY(QStringList items READ items WRITE setItems) Q_PROPERTY(QString currentText READ currentText WRITE setCurrentText NOTIFY currentTextChanged) public: @@ -879,7 +879,7 @@ class WidgetLoader : public QWidget Q_PROPERTY(QString sourceString READ sourceString WRITE setSourceString NOTIFY sourceChanged) Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(QUrl baseUrl READ baseUrl WRITE setBaseUrl) - Q_PROPERTY(QString qmlData READ qmlData WRITE setQmlData NOTIFY sourceQmlDataChanged) + Q_PROPERTY(QString qmlData READ qmlData WRITE setQmlData NOTIFY qmlDataChanged) Q_PROPERTY(QWidget *widget READ widget NOTIFY widgetChanged) Q_PROPERTY(QDeclarativeComponent *component READ component NOTIFY sourceChanged) diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h index ff3912475f..55ba8061e7 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h @@ -82,7 +82,7 @@ class PropertyEditorValue : public QObject Q_PROPERTY(bool isInModel READ isInModel NOTIFY valueChangedQml FINAL) Q_PROPERTY(bool isInSubState READ isInSubState NOTIFY valueChangedQml FINAL) Q_PROPERTY(bool isBound READ isBound NOTIFY isBoundChanged FINAL) - Q_PROPERTY(bool isValid READ isValid NOTIFY isValid FINAL) + Q_PROPERTY(bool isValid READ isValid NOTIFY isValidChanged FINAL) Q_PROPERTY(QString name READ name FINAL) Q_PROPERTY(PropertyEditorNodeWrapper* complexNode READ complexNode NOTIFY complexNodeChanged FINAL) diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp index 0f9edd2c7d..e2b9eb1bd8 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp @@ -168,7 +168,7 @@ QmlItemNode QmlModelView::createQmlItemNode(const ItemLibraryEntry &itemLibraryE QmlItemNode newNode; RewriterTransaction transaction = beginRewriterTransaction(); { - if (itemLibraryEntry.typeName().contains('.')) { + if (itemLibraryEntry.typeName().contains('/')) { const QString newImportUrl = itemLibraryEntry.typeName().split('/').first(); const QString newImportVersion = QString("%1.%2").arg(QString::number(itemLibraryEntry.majorVersion()), QString::number(itemLibraryEntry.minorVersion())); Import newImport = Import::createLibraryImport(newImportUrl, newImportVersion); diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp index 88ba6dfefa..2ea508a353 100644 --- a/src/plugins/qmldesigner/settingspage.cpp +++ b/src/plugins/qmldesigner/settingspage.cpp @@ -49,7 +49,7 @@ DesignerSettings SettingsPageWidget::settings() const DesignerSettings ds; ds.itemSpacing = m_ui.spinItemSpacing->value(); ds.snapMargin = m_ui.spinSnapMargin->value(); - ds.enableContextPane = m_ui.textEditHelperCheckBox->isChecked(); + ds.enableContextPane = false; return ds; } @@ -57,7 +57,6 @@ void SettingsPageWidget::setSettings(const DesignerSettings &s) { m_ui.spinItemSpacing->setValue(s.itemSpacing); m_ui.spinSnapMargin->setValue(s.snapMargin); - m_ui.textEditHelperCheckBox->setChecked(s.enableContextPane); } QString SettingsPageWidget::searchKeywords() const diff --git a/src/plugins/qmldesigner/settingspage.ui b/src/plugins/qmldesigner/settingspage.ui index 48b3f50b83..9a56b1cc31 100644 --- a/src/plugins/qmldesigner/settingspage.ui +++ b/src/plugins/qmldesigner/settingspage.ui @@ -99,22 +99,6 @@ </widget> </item> <item row="1" column="0"> - <widget class="QGroupBox" name="groupBox"> - <property name="title"> - <string>Text Editor Helper</string> - </property> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <widget class="QCheckBox" name="textEditHelperCheckBox"> - <property name="text"> - <string>enable</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item row="2" column="0"> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> |