1. 01 Feb, 2013 37 commits
  2. 31 Jan, 2013 3 commits
    • Robert Loehning's avatar
      Squish: Fixed tst_modify_readonly · f71486fa
      Robert Loehning authored
      Change-Id: I8cce1e72dceb1085cb42f2cfa2bf8a7db721c564
      Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
      f71486fa
    • Tobias Hunger's avatar
      ProjectNodes: Add line information and act on it · f20b92f9
      Tobias Hunger authored
      Also allow for the path to be set. Qbs can move products from one
      file to the next, so that is needed there.
      
      Change-Id: Iebaf3be40fdb0e5e462d45b00cf46d58f985a163
      Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
      f20b92f9
    • Oswald Buddenhagen's avatar
      Merge remote-tracking branch 'origin/2.6' · 1fda2111
      Oswald Buddenhagen authored
      Conflicts:
      	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
      	src/plugins/debugger/qtmessageloghandler.cpp
      	src/plugins/debugger/qtmessagelogwindow.cpp
      	src/plugins/madde/maemodeployconfigurationwidget.cpp
      	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
      	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
      	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
      	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
      	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
      	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
      	src/plugins/qnx/bardescriptormagicmatcher.h
      	src/plugins/qt4projectmanager/profilekeywords.cpp
      	src/plugins/remotelinux/deployablefilesperprofile.cpp
      	src/plugins/remotelinux/deployablefilesperprofile.h
      	src/plugins/remotelinux/deploymentinfo.cpp
      	src/plugins/remotelinux/deploymentsettingsassistant.cpp
      	src/plugins/remotelinux/profilesupdatedialog.cpp
      	tests/auto/icheckbuild/ichecklib.cpp
      	tests/auto/icheckbuild/parsemanager.cpp
      	tests/auto/icheckbuild/parsemanager.h
      
      Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
      1fda2111