1. 26 Mar, 2013 3 commits
    • Eike Ziller's avatar
      Merge remote-tracking branch 'origin/2.7' · 599be01a
      Eike Ziller authored
      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
      599be01a
    • El Mehdi Fekari's avatar
      Qnx: set icon for BB10 Kits · f409fdd6
      El Mehdi Fekari authored
      
      
      Task-number: QTCREATORBUG-8966
      
      Change-Id: Ib5a43de526c652828d164a98342cb38edd266698
      Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
      Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
      f409fdd6
    • Joerg Bornemann's avatar
      fix source file paths of qbs projects on Windows · 1ce8f62c
      Joerg Bornemann authored
      
      
      Task-number: QBS-238
      
      Change-Id: I8f9279836a10d13998e00dafa830a38748c2aa6a
      Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
      1ce8f62c
  2. 25 Mar, 2013 37 commits