Merge remote branch 'origin/2.0' (3922be1b) · Commits · Tobias Hunger / qt-creator

Commit 3922be1b authored 15 years ago by con

Merge remote branch 'origin/2.0'

Conflicts:
	src/plugins/texteditor/texteditoractionhandler.cpp

parents 17fd33bd 626221b6

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/plugins/projectexplorer/buildstepspage.cpp 35 additions, 21 deletions

src/plugins/projectexplorer/buildstepspage.cpp
src/plugins/projectexplorer/doubletabwidget.cpp 1 addition, 1 deletion

src/plugins/projectexplorer/doubletabwidget.cpp
src/plugins/projectexplorer/images/targetseparatorbackground.png 0 additions, 0 deletions

...gins/projectexplorer/images/targetseparatorbackground.png
src/plugins/projectexplorer/projectexplorer.cpp 3 additions, 3 deletions

src/plugins/projectexplorer/projectexplorer.cpp
src/plugins/projectexplorer/targetselector.cpp 2 additions, 0 deletions

src/plugins/projectexplorer/targetselector.cpp
src/plugins/projectexplorer/targetsettingspanel.cpp 1 addition, 2 deletions

src/plugins/projectexplorer/targetsettingspanel.cpp
src/plugins/qmldesigner/components/formeditor/dragtool.cpp 8 additions, 8 deletions

src/plugins/qmldesigner/components/formeditor/dragtool.cpp
src/plugins/qmldesigner/components/formeditor/dragtool.h 1 addition, 1 deletion

src/plugins/qmldesigner/components/formeditor/dragtool.h
src/plugins/qmldesigner/components/formeditor/formeditorview.h 1 addition, 1 deletion

...lugins/qmldesigner/components/formeditor/formeditorview.h
src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp 2 additions, 2 deletions

...ins/qmldesigner/components/formeditor/itemcreatortool.cpp
src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp 3 additions, 10 deletions

.../qmldesigner/components/itemlibrary/customdraganddrop.cpp
src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.h 1 addition, 2 deletions

...ns/qmldesigner/components/itemlibrary/customdraganddrop.h
src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h 1 addition, 2 deletions

src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h
src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp 34 additions, 78 deletions

...s/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h 6 additions, 3 deletions

...ins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp 3 additions, 2 deletions

...ns/qmldesigner/components/navigator/navigatortreeview.cpp
src/plugins/qmldesigner/components/resources/images/slider_indikator.png 0 additions, 0 deletions

...designer/components/resources/images/slider_indikator.png
src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h 44 additions, 17 deletions

...lugins/qmldesigner/designercore/include/itemlibraryinfo.h
src/plugins/qmldesigner/designercore/include/metainfo.h 5 additions, 4 deletions

src/plugins/qmldesigner/designercore/include/metainfo.h
src/plugins/qmldesigner/designercore/include/metainfoparser.h 3 additions, 3 deletions

...plugins/qmldesigner/designercore/include/metainfoparser.h

with 154 additions and 160 deletions

Please register or to comment