1. 21 Dec, 2010 6 commits
  2. 20 Dec, 2010 19 commits
  3. 17 Dec, 2010 15 commits
    • hjk's avatar
      debugger: fix previous commit · a23a45da
      hjk authored
      a23a45da
    • hjk's avatar
      d55499f5
    • con's avatar
      License headers, part 2 · 23c22b7c
      con authored
      23c22b7c
    • con's avatar
      Compile fix for Mac. · 73b813fd
      con authored
      73b813fd
    • con's avatar
      Merge branch '2.1' · b1bcf081
      con authored
      Conflicts:
      	src/plugins/coreplugin/basemode.cpp
      	src/plugins/coreplugin/basemode.h
      	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
      	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
      	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
      	src/plugins/debugger/debuggeragents.cpp
      	src/plugins/debugger/debuggeruiswitcher.cpp
      	src/plugins/debugger/debuggeruiswitcher.h
      	src/plugins/projectexplorer/buildconfigdialog.cpp
      	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
      	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
      	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
      	src/plugins/qmldesigner/designercore/include/modelutilities.h
      	src/plugins/qmldesigner/designercore/include/nodeinstance.h
      	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
      	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
      	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
      	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
      	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
      	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
      	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
      	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
      	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
      	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
      	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
      	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
      	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
      	src/plugins/snippets/inputwidget.cpp
      	src/plugins/snippets/snippetscompletion.cpp
      	src/plugins/snippets/snippetscompletion.h
      	src/plugins/snippets/snippetspec.cpp
      	src/plugins/snippets/snippetsplugin.cpp
      	src/plugins/snippets/snippetswindow.cpp
      	src/plugins/snippets/snippetswindow.h
      	src/plugins/texteditor/snippetsparser.cpp
      	src/tools/qml/qmldom/main.cpp
      	tests/manual/trk/runner.cpp
      	tests/manual/trk/trkolddevice.cpp
      	tests/manual/trk/trkolddevice.h
      	tests/manual/trk/trkserver.cpp
      b1bcf081
    • con's avatar
      Show Qt Creator resources in Locator on Mac · 77f45cae
      con authored
      77f45cae
    • con's avatar
      Some API beautification in action container. · 4321e01e
      con authored
      Done-with: Daniel Molkentin
      4321e01e
    • Friedemann Kleint's avatar
    • con's avatar
      License headers. · 04e32b00
      con authored
      04e32b00
    • Robert Loehning's avatar
      L10n: Improved German translations · cb571a9f
      Robert Loehning authored
      %1 contains the error message, not the hostname.
      Other typos fixed as well.
      
      Reviewed-by: ossi
      cb571a9f
    • Christian Kandeler's avatar
      Maemo: Improve file selection dialog for publishing. · 0246a11a
      Christian Kandeler authored
      - Make sure file names are completely visible.
      - Show hidden files.
      - Pre-unselect files of types unlikely to be included in the package.
      0246a11a
    • Friedemann Kleint's avatar
      Debugger[New CDB]: Add std::deque. · a7319f38
      Friedemann Kleint authored
      a7319f38
    • hjk's avatar
      debugger: remove accidentally committed debug output · 5b7494cf
      hjk authored
      5b7494cf
    • hjk's avatar
      2e4ba82b
    • hjk's avatar
      b976a34e