1. 12 Feb, 2015 13 commits
    • Eike Ziller's avatar
      Merge commit '3c850586' · 9926fc2a
      Eike Ziller authored
      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
      9926fc2a
    • hjk's avatar
      Debugger: Some code modernization · f1c5889e
      hjk authored
      Qt 5 signal/slot, a few auto.
      
      Change-Id: Ia17f1b3dcd41dfe0a373c14e7c1d34d210d084f1
      Reviewed-by: default avatarChristian Stenger <christian.stenger@theqtcompany.com>
      f1c5889e
    • Eike Ziller's avatar
      Merge commit 'd83fb4d6' · 0eabe627
      Eike Ziller authored
      Change-Id: Ibd6f8cd83c60f0c65387b62b7692aa8a4c025acb
      0eabe627
    • Nikita Baryshnikov's avatar
      ManageDefinitionsDialog: Fix regression · 052de4d1
      Nikita Baryshnikov authored
      after 102e49ca
      
      Change-Id: I5f2fb7c3309d0c14e4c470bb2716ee000d8ddc95
      Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
      052de4d1
    • hjk's avatar
      Debugger: Combine some watch related GDB and LLDB code paths · f91cc66f
      hjk authored
      Change-Id: I20e5f6f04418c931354a07bc3597f6982fcaf942
      Reviewed-by: default avatarChristian Stenger <christian.stenger@theqtcompany.com>
      f91cc66f
    • Christian Kandeler's avatar
      Analyzer: Use QKeySequence::copy for copying to clipboard. · cf21092e
      Christian Kandeler authored
      Change-Id: I238eace2198e5a2329ce7db559e4df354e84cb80
      Reviewed-by: default avatarhjk <hjk@theqtcompany.com>
      cf21092e
    • Nikolai Kosjar's avatar
      C++: Cache parsing of template ids · 921ec6da
      Nikolai Kosjar authored
      ...in order to stop memory intensive parsing for invalid code.
      
      Parsing the test data/snippet "hard" led to a memory consumption of
      about 5.5MB and this could easily get up to hundreds/gigabytes by adding
      some more "if_<bool_<true>,\n" lines. With the caching, we are at about
      1.0MB, even if more lines are added.
      
      The "memory consumption" was measured with valgrind-massif. The stated
      numbers are the reported peaks.
      
      Task-number: QTCREATORBUG-12890
      Change-Id: Ie7eb00cfc7915552d29bb27410a6b13a486f486e
      Reviewed-by: default avatarErik Verbruggen <erik.verbruggen@theqtcompany.com>
      921ec6da
    • Nikolai Kosjar's avatar
      C++: Remove workaround for crashing if parsing invalid code · ae3aa07c
      Nikolai Kosjar authored
      This reverts the changes
      
          commit beac7b95
          C++: Fix highlighting after "invalid code"
      
          commit 78ab287f
          C++: Stop parsing a declaration after two tries
      
      which were a work around for QTCREATORBUG-12890.
      
      A follow-up patch provides a proper fix.
      
      Task-number: QTCREATORBUG-12890
      Change-Id: I2650a8e41c8ff1180cad9f069e463fc51bd2f1b1
      Reviewed-by: default avatarErik Verbruggen <erik.verbruggen@theqtcompany.com>
      ae3aa07c
    • Nikolai Kosjar's avatar
      QmakeProject: Fix mkspecs dir include path · d68fc038
      Nikolai Kosjar authored
      1) When the compiler is invoked, the mkspecs dir is the very first
         include path, but the code model got it as the very last (still before
         the system include paths) include path.
      
      2) We had it twice in the include path list.
      
      Change-Id: Ia46b6009359c5799790e6c856113ea133b8212c6
      Reviewed-by: default avatarErik Verbruggen <erik.verbruggen@theqtcompany.com>
      d68fc038
    • Nikolai Kosjar's avatar
      QmakeProjectManager: Shell-interpret project defines · e9b94c13
      Nikolai Kosjar authored
      ...since they are meant to end up in Makefiles.
      
      A define like
      
          DEFINES += SRCDIR=\\\"$$PWD\\\"
      
      was passed on to the code model as
      
          #define SRCDIR \"/tmp/dir\"
      
      instead of
      
          #define SRCDIR "/tmp/dir"
      
      Change-Id: I7af5c8d82b3b937ca9db70f6580bab3419fb4550
      Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
      Reviewed-by: default avatarErik Verbruggen <erik.verbruggen@theqtcompany.com>
      e9b94c13
    • hjk's avatar
      Debugger: Convert bb extension to use runCommand · 9df463da
      hjk authored
      Change-Id: I528c51d2b02dccd91429778ef8c940fe5565345f
      Reviewed-by: default avatarChristian Stenger <christian.stenger@theqtcompany.com>
      9df463da
    • Christian Kandeler's avatar
      Analyzer: Put more common code into the DetailedError* base classes. · d9408156
      Christian Kandeler authored
      Namely:
          - The "copy" action and the corresponding "slot".
          - The context menu.
      Plus an infrastructure for adding new common and custom actions.
      
      Change-Id: I4bf8b28b4ad60b4022abbfc0b401c3b832b94560
      Reviewed-by: default avatarNikolai Kosjar <nikolai.kosjar@theqtcompany.com>
      d9408156
    • hjk's avatar
      Debugger: Move bbsetup over to runCommand() · 875d8890
      hjk authored
      Change-Id: I0a19b28d24cb570651ea84bf7cdbc9a761f85a0b
      Reviewed-by: default avatarChristian Stenger <christian.stenger@theqtcompany.com>
      875d8890
  2. 11 Feb, 2015 10 commits
  3. 10 Feb, 2015 15 commits
  4. 09 Feb, 2015 2 commits