feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
46,723 Commits 108 Branches 368 Tags
ff9a49f99f652f0217a118e32447d45c9d89e30a
Commit Graph

144 Commits

Author SHA1 Message Date
Tim Jenssen
172ea7aa6d QmlDesigner: avoid unused warning in release 
Change-Id: I6213fd3555b28b14d23453c24b94acef5baeaf3a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-06-08 09:30:00 +00:00
Tim Jenssen
6512227302 QmlDesigner: merge QmlWarningDialog and DocumentWarningWidget 
- fixed cases where the user got the one and the other
    dialog
  - not only the first error is shown, the user can browse

Task-number: QTCREATORBUG-15772
Change-Id: I27786b0e4f9c987646a69d8d7d9ff33e3702587a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-05-20 10:29:16 +00:00
Christian Stenger
e4b2842bf8 QmlDesigner: Fix compile with Qt5.5 
Change-Id: Ib1ec04cb9baf4d936d73ceb0d80268aad882368b
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-05-10 15:27:32 +00:00
Tim Jenssen
221f59e152 QmlDesigner: modernize code 
- no behavior changes
 - moved a slot to a lambda
 - Using QPointer instead of raw pointer to trigger
   assert if dangling pointer is accessed.
   Refactoring the code might accidentally trigger a
   delete of the QWidget.

Change-Id: Idf711da92e13cf81dd718ae9e034bca7f6d26220
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-05-10 13:04:15 +00:00
Tim Jenssen
cacdcf7160 QmlDesigner: improve warning widget code 
- the "move" code needs to be inside the warning widget,
   this also fixes the problem of wrong position at startup
 - the patch removes knowledge about the DesignModeWidget and
   uses a signal

Change-Id: I9a861ab955d16e85d7af36f1b56ddb82578b8da4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-05-10 13:04:04 +00:00
Tim Jenssen
62e3c0dbf4 QmlDesigner: move RewriterError to an extra file 
Change-Id: I453b30f45e0bc447b05694eadda60d4613e88062
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-05-10 13:03:57 +00:00
Tim Jenssen
af11c6f0c2 QmlDesigner: build fix 
Change-Id: I7c25ebb25a561ac47464d2cedb69e4fc70d1a704
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-04-29 10:06:30 +00:00
Tim Jenssen
55c951e4a7 QmlDesigner: move DocumentWarningWidget to extra file 
Change-Id: I6ea87a224565b77ff42f187461094ca258dcdb01
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-04-29 08:07:15 +00:00
Tim Jenssen
a29dcac4cf QmlDesigner: modernize code style 
- no behavior changes
 - using nullptr
 - renaming data -> d
 - transform single used small slot function to lambdas

Change-Id: Ifae389b8a865b0b6a501b6f3d60597a66d9febe8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-04-29 08:07:09 +00:00
hjk
5e47d35fcd Use Core::Id in ModeManager interface 
Makes it more uniform to use and allows placeholder widget
creation to be independent of mode creations.

Change-Id: I4021bc9db7f8c78f0374c0cc3b3331506959afe4
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2016-04-08 10:38:49 +00:00
Tim Jenssen
75f31fe18b QmlDesigner: move goToError code to lambda 
Change-Id: I271a2697c2c606f81616a8e0091f2a43fcfaacf0
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2016-03-17 12:31:21 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation 
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 15:57:01 +00:00
Alessandro Portale
374f84acc7 Qt Quick Designer: License change to Qt Commercial + GPLv3 
Change-Id: I7f7aecd02892b6c616cd148fa5d845e7bc0d3b4f
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2015-09-18 12:12:57 +00:00
Thomas Hartmann
9d8441986e QmlDesigner: Avoid leaking unused view widgets 
IF a widget is never shown it has no parent
and has to be deleted manually.

Change-Id: I5cf34e3a7706dd3472d4388a04bf12910530fe4d
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-07-20 11:48:06 +00:00
Thomas Hartmann
4acc370b0f QmlDesigner: Improve error message for errors in QML when loading the document 
Change-Id: I3c47c199291c3661d0efb3a6df36aa281438d199
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-07-17 12:55:39 +00:00
Thomas Hartmann
80eb278765 QmlDesigner: Rename SLOT to different name then the signal 
Change-Id: I79857fb7fb76ab6bb5c4f2d668c30a6552cadb00
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-07-15 09:13:25 +00:00
Thomas Hartmann
2c32e57877 QmlDesigner: This fixes a UI glitch in the toolbar 
For some reason
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)
fixes a styling bug in the toolbar.

Change-Id: I8ac219a0896d36ce5632eee1542b37fc577673ff
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-07-15 09:13:19 +00:00
Thomas Hartmann
8cdfc4e097 QmlDesigner.Rewriter: Cleaning up the warning code 
The class is renamed to RewriterError and moved outside of RewriterView.
Reason: Inner classes cannot be forward declared in C++.

Changing RewriterView::Error to RewriterError, because inner
classes cannot be forward declared.

Change-Id: I51e3b08efeda44a8cd2abe84e833a5f8c190b84e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2015-07-15 09:12:32 +00:00
Friedemann Kleint
54da18eaaa Clean exported headers of the Core plugin. 
Change-Id: I26472d568844d5fee62323e01f5c5c12082d5450
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-03-05 07:18:14 +00:00
Friedemann Kleint
fe2addf515 Clean exported headers of the TextEditor plugin. 
Change-Id: I1e7dd34ba5a51fb0b34d137dc03add4457b32ed1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-02-26 13:15:29 +00:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01:00
Montel Laurent
0df6780176 Convert to new connect api 
Change-Id: I80aad51340bcde953763dec36cf989d6e19d4cd0
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-01-30 09:40:20 +00:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Orgad Shaneh
c6a983d271 Core: Use FileName for file path in IDocument 
Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-01-12 10:23:37 +01:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
 2014-10-14 15:36:16 +02:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
hjk
bf5e43be94 TextEditor: Merge ITextEditor and BaseTextEditor 
Adjust all callers, de-export BaseTextEditorAnimator

Change-Id: I2329d976c1398e2449844bb480a4d4ed29859506
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-07-25 13:45:55 +02:00
Eike Ziller
a4cb16adb1 EditorManager: Remove useless method 
Change-Id: I87c2d861d88e783bd41f200a76853477d05cce0f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2014-07-21 10:01:30 +02:00
Marco Bubke
4c269ccd78 QmlDesigner: Don't close sidebars 
You cannot reopen them.

Change-Id: I83e63fb7628b933e82f6a690cbe3de97cf57f3c3
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-02 13:16:22 +02:00
Marco Bubke
4b9bf09ebf QmlDesigner: Move DocumentWarningWidgetwarning to the center 
Change-Id: Ieb3873cc4951391b4048d573a6817644c055cee6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-07-02 13:16:18 +02:00
Marco Bubke
4743217eac QmlDesigner: Exchange QLatin1String with QStringLiteral 
Change-Id: Iaefe0ea33ee17795cb402da33e4e7f0da747d4d5
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-05-13 15:05:38 +02:00
Marco Bubke
b2814f2753 QmlDesigner: Hide ToolButtons instead of deleting them 
Task-number: QTCREATORBUG-11900
Change-Id: I009e620a19a1747ea7a1c3580c63e0a56b05564e
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-04-01 11:53:17 +02:00
Marco Bubke
0e3634d311 QmlDesigner: Don't show extra tool buttons in the side bars 
Task-number: QTCREATORBUG-11731
Change-Id: I75b70ace17ef291a7baa64abd6068bf472b43546
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-03-25 15:44:51 +01:00
Marco Bubke
2cf25b1339 QmlDesigner: Fix missing error message for puppet crash 
Task-number: QTCREATORBUG-11767
Change-Id: I6130ba1a07a29ba5fe765d22d609b3edb44c815f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-03-24 15:38:11 +01:00
Friedemann Kleint
819413fc23 QML Designer: Fix build on Windows/MSVC. 
Variable names should be different.

Change-Id: Ibf7c8dd95ffc59d0c02341dffa107f0a0441beaa
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-03-19 17:48:26 +01:00
Marco Bubke
2f0642f997 QmlDesigner: Hide states editor for full screen 
Task-number: QTCREATORBUG-6266
Change-Id: Ib71d65a7abcdc482acf0cba770f250220b071c5d
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-03-19 15:20:57 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Tobias Hunger
ce28e36219 QmlDesigner: Plug mem leak when design mode is not opened 
Change-Id: I4917dd3dd1d85b7eb35dce50d2283ac2039c0a2e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-02 10:17:13 +02:00
Thomas Hartmann
361821c8ec QmlDesigner: moving CrumbleBar and ComponentAction 
Moving the CrumbleBar and the ComponentAction out of the FormEditor
into the DesignModeWidget.

These widgets are about document navigation and do not belong to
the FormEditor.

Change-Id: I5cd177d70f7c8f9cc2913c8c3c640d62fefd718d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-08-05 13:05:47 +02:00
Eike Ziller
dd43d9908f Rename IDocument::fileName --> filePath 
That is what it actually is, wrt how Qt API calls it.

Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-09 13:51:42 +02:00
Eike Ziller
7c8db79817 Switch less often to edit mode 
This change
* Removes IMode::type, ModeManager::activateModeType, and
  IEditor::preferredModeType, and adds IEditor::isDesignModePreferred
  instead
* Adapts the mode switching code in EditorManager to handle multiple
  windows, for example switching to edit mode should only happen if
  the editor/view is in the main window. Otherwise the editor window
  should be raised and focused
* Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor
* Reverts the EditorManager::ModeSwitch logic to switch mode or
  make the current editor visible by default, introducing
  DoNotMakeVisible flag instead
* Fixes a few instances where EditorManager::ModeSwitch should have been
  used

One non-trivial problem left: If you open a .ui file and switch to an
external editor window, edit mode is activated, because the current
editor no longer is a .ui file, which means that the design mode gets
deactivated.

Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-06-05 09:43:14 +02:00
Friedemann Kleint
ffbbf64e29 Clean headers in QML-Designer. 
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I8a2e9e35980198fc4162623db044c228bd209a0f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-04-30 14:09:58 +02:00
Eike Ziller
599be01a67 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
	src/plugins/qmldesigner/components/debugview/debugview.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
	src/plugins/qmldesigner/components/navigator/navigatorview.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
	src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134
 2013-03-26 13:09:43 +01:00
Thomas Hartmann
e367a39c71 QmlDesigner: adding interface to customize toolbar buttons 
WidgetInfo contains now a factory for the toolbar buttons.
The ownership of the factory is taken by the SideBarItem.

Change-Id: Iffa32359cd3f0cb5b378abc5371d810aee31649c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-03-25 13:55:59 +01:00
Marco Bubke
26283cdb67 QmlDesigner: Add registration of additional views. 
Change-Id: I48aff6a1a94ca3c0bcd8b0689333b6acad7d35cd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit 81341a8659)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-03-25 13:36:01 +01:00
Thomas Hartmann
d204ee0b43 QmlDesigner: Type of the propertyname is now PropertyName 
And PropertyName is a typedef for QByteArray. Because we don't use the
features of QString and the source would be cluttered with QLatin1Strings
we changed the property name to QByteArray.

Change-Id: Ib70ef136bbc411504b450456bd9bb705ae93dd25
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit ee4bf638ca)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-03-25 13:35:11 +01:00
Friedemann Kleint
7043a7e01b Fix Krazy warnings about duplicate includes. 
Change-Id: Ied32236a84d20225b1ca4a192f3a346fbfbd09b4
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-20 15:04:10 +01:00
Marco Bubke
81341a8659 QmlDesigner: Add registration of additional views. 
Change-Id: I48aff6a1a94ca3c0bcd8b0689333b6acad7d35cd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-03-11 17:22:25 +01:00
Thomas Hartmann
ee4bf638ca QmlDesigner: Type of the propertyname is now PropertyName 
And PropertyName is a typedef for QByteArray. Because we don't use the
features of QString and the source would be cluttered with QLatin1Strings
we changed the property name to QByteArray.

Change-Id: Ib70ef136bbc411504b450456bd9bb705ae93dd25
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-03-05 12:34:39 +01:00
Marco Bubke
e8acc05b1d QmlDesigner: Remove unused functions 
Change-Id: I930718a5d792d7d5f6c790d904be228f44274a9c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-02-12 12:04:58 +01:00