Merge remote-tracking branch 'origin/2.2'
Conflicts: src/plugins/debugger/debuggersourcepathmappingwidget.cpp
No related branches found
No related tags found
Showing
- dist/changes-2.2.0 5 additions, 1 deletiondist/changes-2.2.0
- doc/addressbook-sdk.qdoc 1 addition, 1 deletiondoc/addressbook-sdk.qdoc
- doc/qtcreator.qdoc 1 addition, 1 deletiondoc/qtcreator.qdoc
- share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp 52 additions, 97 deletionsshare/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.cpp
- share/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h 10 additions, 16 deletionsshare/qtcreator/qml/qmljsdebugger/editor/qmltoolbar.h
- share/qtcreator/qml/qmljsdebugger/include/qdeclarativeobserverservice.h 3 additions, 2 deletions...r/qml/qmljsdebugger/include/qdeclarativeobserverservice.h
- share/qtcreator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h 8 additions, 5 deletions...ator/qml/qmljsdebugger/include/qdeclarativeviewobserver.h
- share/qtcreator/qml/qmljsdebugger/protocol/observerprotocol.h 22 additions, 20 deletions...e/qtcreator/qml/qmljsdebugger/protocol/observerprotocol.h
- share/qtcreator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp 19 additions, 3 deletions...creator/qml/qmljsdebugger/qdeclarativeobserverservice.cpp
- share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp 37 additions, 37 deletions.../qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp
- share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h 2 additions, 2 deletions.../qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver_p.h
- share/qtcreator/qml/qmljsdebugger/qmljsdebugger-src.pri 2 additions, 0 deletionsshare/qtcreator/qml/qmljsdebugger/qmljsdebugger-src.pri
- share/qtcreator/qml/qmlobserver/qmlruntime.cpp 21 additions, 30 deletionsshare/qtcreator/qml/qmlobserver/qmlruntime.cpp
- share/qtcreator/qml/qmlobserver/qmlruntime.h 3 additions, 3 deletionsshare/qtcreator/qml/qmlobserver/qmlruntime.h
- share/qtcreator/translations/qtcreator_de.ts 228 additions, 507 deletionsshare/qtcreator/translations/qtcreator_de.ts
- src/libs/qtcreatorcdbext/cdb_detect.pri 10 additions, 12 deletionssrc/libs/qtcreatorcdbext/cdb_detect.pri
- src/libs/qtcreatorcdbext/symbolgroupvalue.cpp 33 additions, 11 deletionssrc/libs/qtcreatorcdbext/symbolgroupvalue.cpp
- src/libs/utils/winutils.cpp 8 additions, 40 deletionssrc/libs/utils/winutils.cpp
- src/libs/utils/winutils.h 2 additions, 4 deletionssrc/libs/utils/winutils.h
- src/plugins/bazaar/clonewizard.cpp 1 addition, 1 deletionsrc/plugins/bazaar/clonewizard.cpp
Loading
Please register or sign in to comment