diff options
| author | Oswald Buddenhagen <[email protected]> | 2011-06-23 19:46:43 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <[email protected]> | 2011-06-23 19:47:50 +0200 |
| commit | 1d78e594d8d3d895a1961fdf105f0af68d5fcc2e (patch) | |
| tree | 873c7f648c86ca599fbe81e849e37bd6266c027c /src/plugins | |
| parent | 1f8de24e2c3f43ba743e5ef6f057db927aaf50e7 (diff) | |
| parent | 568985ab0325ae1db633ecf3ca40b9ba6929313a (diff) | |
Merge branch '2.2'
Conflicts:
qtcreator.pri
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
src/libs/qmljs/qmljsdocument.cpp
src/libs/qmljs/qmljsinterpreter.cpp
src/libs/qmljs/qmljsinterpreter.h
src/libs/qmljs/qmljslink.cpp
src/plugins/cppeditor/cppquickfixes.cpp
src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
src/plugins/qmldesigner/qmldesigner.pro
src/plugins/qmldesigner/symbianplugin/symbian.metainfo
src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h
Change-Id: Id5f754e2837a3bb3e0687ed09f1dda45fd0c5617
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmldesigner/symbianplugin/symbian.metainfo | 12 | ||||
| -rw-r--r-- | src/plugins/qmljseditor/qmljseditor.cpp | 5 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/plugins/qmldesigner/symbianplugin/symbian.metainfo b/src/plugins/qmldesigner/symbianplugin/symbian.metainfo index 7b993d6e22a..153cb230347 100644 --- a/src/plugins/qmldesigner/symbianplugin/symbian.metainfo +++ b/src/plugins/qmldesigner/symbianplugin/symbian.metainfo @@ -33,11 +33,11 @@ <property name="height" type="int" value="30"/> </itemlibraryentry> </node> - <node name="com.nokia.symbian.ChoiceList" icon=":/symbianplugin/images/choicelist16.png"> - <itemlibraryentry name="ChoiceList" category="Components Symbian" libraryIcon=":/symbianplugin/images/choicelist.png" version="1.0" requiredImport="com.nokia.symbian"> - <property name="width" type="int" value="180"/> - <property name="height" type="int" value="40"/> - <property name="currentValue" type="QString" value="ChoiceList"/> + <node name="com.nokia.symbian.SelectionListItem" icon=":/symbianplugin/images/choicelist16.png"> + <itemlibraryentry name="SelectionListItem" category="Components Symbian" libraryIcon=":/symbianplugin/images/choicelist.png" version="1.0" requiredImport="com.nokia.symbian"> + <property name="width" type="int" value="360"/> + <property name="height" type="int" value="84"/> + <property name="title" type="QString" value="Selection List"/> </itemlibraryentry> </node> <node name="com.nokia.symbian.ProgressBar" icon=":/symbianplugin/images/progressbar16.png"> @@ -115,4 +115,4 @@ <property name="text" type="QString" value="TextField"/> </itemlibraryentry> </node> -</metainfo>
\ No newline at end of file +</metainfo> diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index 6d0f030f749..20f5ade3ef0 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -639,7 +639,7 @@ QmlJSTextEditorWidget::QmlJSTextEditorWidget(QWidget *parent) : m_semanticRehighlightTimer = new QTimer(this); m_semanticRehighlightTimer->setInterval(UPDATE_DOCUMENT_DEFAULT_INTERVAL); m_semanticRehighlightTimer->setSingleShot(true); - connect(m_semanticRehighlightTimer, SIGNAL(timeout()), this, SLOT(forceSemanticRehighlight())); + connect(m_semanticRehighlightTimer, SIGNAL(timeout()), this, SLOT(forceSemanticRehighlightIfCurrentEditor())); connect(this, SIGNAL(textChanged()), this, SLOT(updateDocument())); @@ -807,6 +807,9 @@ void QmlJSTextEditorWidget::onDocumentUpdated(QmlJS::Document::Ptr doc) { if (file()->fileName() != doc->fileName() || doc->editorRevision() != document()->revision()) { + // maybe a dependency changed: schedule a potential rehighlight + // will not rehighlight if the current editor changes away from this file + m_semanticRehighlightTimer->start(); return; } |