1. 15 Oct, 2014 17 commits
  2. 14 Oct, 2014 23 commits
    • hjk's avatar
      VariableChooser: Rework · 3119d93b
      hjk authored
      Allow multiple expanders to be registered for lineedits, e.g. a
      local and the global ones, and actually show them.
      
      Use a tree view in the chooser for somewhat more structured display.
      
      Change-Id: I769f92144e5249f45e54381de52aa6973eb20118
      Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
      3119d93b
    • hjk's avatar
      MacroExpander: Allow registering local expansions · e279c7e0
      hjk authored
      This allows a MacroExpander also to describe an expansion it can
      do which was restricted to the global VariableManager only.
      
      The global is now just a thin (unneeded) wrapper about new "standard"
      functionality.
      
      Change-Id: Ida7ca70cf3d319eae4220ea8d12f3dd1c0d4042c
      Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
      e279c7e0
    • hjk's avatar
      Debugger: Add auto test for QVarLengthArray dumper · e43af30f
      hjk authored
      Change-Id: I25af89bea8fe7781ae6b1b21fd294753f8519ee6
      Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
      e43af30f
    • Tobias Hunger's avatar
      JsonWizard: Replace JsFileWizard with a JsonWizard · cd0ff57e
      Tobias Hunger authored
      Change-Id: I4da3485ed83fda7f17f3fa9a1f3d59bfabb7ea4d
      Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
      cd0ff57e
    • Tobias Hunger's avatar
      JsonWizard: Add a customizeable page · 86ecc7d1
      Tobias Hunger authored
      Add a way to define custom pages with checkboxes, lineedits, etc.
      on it.
      
      Change-Id: I012109eabf00a12abc67ae34514d139b7cd7cf0d
      Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
      86ecc7d1
    • hjk's avatar
      Debugger: Fix recent typo in putSimpleCharArray · 65ebdc7e
      hjk authored
      The joys of scripting languages without compile time checks.
      
      Change-Id: Ic9405d549f3e60d5b834350fa3bce1d4d4609747
      Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
      65ebdc7e
    • hjk's avatar
      Kit: Rename m_displayName to m_unexpandedDisplayName · 6b28505d
      hjk authored
      That's what it is.
      
      Change-Id: Ibd19203b30a98eb2b4b57039a8d619c031d2e5e2
      Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
      6b28505d
    • hjk's avatar
      Utils: Add a base for tree like models · 88e4daa8
      hjk authored
      That kind of boiler plate comes up often enough to justify a wrapper.
      
      Change-Id: I94aa5b1ccbe5a98f091a47087654e59e9e122c1d
      Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
      88e4daa8
    • Orgad Shaneh's avatar
      Debugger: Remove unused values from DebuggerStartMode · 1ff1b8db
      Orgad Shaneh authored
      Change-Id: I84ec3dea504e51bb925c925564aa9b5c84133fbf
      Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
      1ff1b8db
    • Eike Ziller's avatar
      Help Window: Add missing connect for contents view action · bb497cec
      Eike Ziller authored
      Change-Id: I4504f00d138e42453132ee7ec7513216ab9e783b
      Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
      bb497cec
    • Eike Ziller's avatar
      Help: Remove the now duplicate side bar code for central widget · f4b3f20c
      Eike Ziller authored
      By adding the open pages widget to the shared help widget for the mode
      widget.
      
      Change-Id: Ib2d63134d1e17356a285ad048529c50e151a2354
      Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
      f4b3f20c
    • Eike Ziller's avatar
      Help Window: Add search view to side bar · 8fcf27fd
      Eike Ziller authored
      Change-Id: If3acbad9694b6d1a3441007a9fa9c13a3738aa5f
      Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
      8fcf27fd
    • Eike Ziller's avatar
      Help: Make it possible to duplicate search view · 00209382
      Eike Ziller authored
      Change-Id: I6fac9f721fc3e2f877d9f600f9dea6650558516a
      Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
      00209382
    • Thomas Hartmann's avatar
      Wizard for ui.qml file based project. · d7105cc2
      Thomas Hartmann authored
      Change-Id: Id0f61efce0ae47c28eb2f5fbcee5468dc5c339ca
      Reviewed-by: default avatarKai Koehne <kai.koehne@theqtcompany.com>
      Reviewed-by: default avatarAlessandro Portale <alessandro.portale@digia.com>
      d7105cc2
    • Thomas Hartmann's avatar
      Fix compilation for msvc2012 · cf0f2e46
      Thomas Hartmann authored
      Change-Id: I2d4d2ed7060acee1cb90f7506f3721f073f49d96
      Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
      cf0f2e46
    • Eike Ziller's avatar
      020c8603
    • Orgad Shaneh's avatar
      ProjectExplorer: Remove redundant namespace qualifications · c884f3e0
      Orgad Shaneh authored
      Change-Id: Id9034e31f3f61c38894111951534dd0d59b746dc
      Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
      c884f3e0
    • Tobias Hunger's avatar
      QtSupport: Add method to query UI class name · c86ef46f
      Tobias Hunger authored
      Change-Id: Idc1cfd87415093dab4245d84797b0971ec496b45
      Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
      c86ef46f
    • Tobias Hunger's avatar
      QtSupport: Code cosmetics · 08227991
      Tobias Hunger authored
      Avoid one needless level of nesting.
      
      Change-Id: Ied229d59eef03493041fe9e802ec71ca6e40e0a6
      Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
      08227991
    • Tobias Hunger's avatar
      QtSupport: Add missing Q_OBJECT macro · 6c646339
      Tobias Hunger authored
      Without it this QObject is not accessible from Javascript
      as it needs to be.
      
      Change-Id: I6ffdb677cc3c986f0f95bded60f6f097b2c4f3cd
      Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
      6c646339
    • Thomas Hartmann's avatar
      QmlJSEditor: warn when editing .ui.qml, activate designer checks · 93c3ee1b
      Thomas Hartmann authored
      Change-Id: I2f6d39633341bd1197d16c5c097573d4ab090896
      Reviewed-by: default avatarFawzi Mohamed <fawzi.mohamed@digia.com>
      Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
      93c3ee1b
    • Eike Ziller's avatar
      Merge remote-tracking branch 'origin/3.2' · ea271432
      Eike Ziller authored
      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
      ea271432
    • Robert Loehning's avatar
      Squish: Update object for tst_modify_readonly · e2456cf8
      Robert Loehning authored
      Change-Id: I45814f0e7d7e719c4ea73de658e44bd0e7c17d9a
      Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
      e2456cf8