Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- share/qtcreator/gdbmacros/gdbmacros.cpp 1 addition, 1 deletionshare/qtcreator/gdbmacros/gdbmacros.cpp
- src/app/Info.plist 4 additions, 2 deletionssrc/app/Info.plist
- src/app/app.pro 3 additions, 0 deletionssrc/app/app.pro
- src/app/prifile.icns 0 additions, 0 deletionssrc/app/prifile.icns
- src/app/profile.icns 0 additions, 0 deletionssrc/app/profile.icns
- src/libs/utils/filesearch.cpp 2 additions, 3 deletionssrc/libs/utils/filesearch.cpp
- src/libs/utils/styledbar.cpp 65 additions, 0 deletionssrc/libs/utils/styledbar.cpp
- src/libs/utils/styledbar.h 23 additions, 0 deletionssrc/libs/utils/styledbar.h
- src/libs/utils/stylehelper.cpp 0 additions, 0 deletionssrc/libs/utils/stylehelper.cpp
- src/libs/utils/stylehelper.h 2 additions, 2 deletionssrc/libs/utils/stylehelper.h
- src/libs/utils/utils.pro 8 additions, 2 deletionssrc/libs/utils/utils.pro
- src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp 6 additions, 0 deletionssrc/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
- src/plugins/cmakeprojectmanager/cmakerunconfiguration.h 1 addition, 0 deletionssrc/plugins/cmakeprojectmanager/cmakerunconfiguration.h
- src/plugins/coreplugin/coreplugin.pro 0 additions, 2 deletionssrc/plugins/coreplugin/coreplugin.pro
- src/plugins/coreplugin/fancytabwidget.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/fancytabwidget.cpp
- src/plugins/coreplugin/fileiconprovider.cpp 16 additions, 3 deletionssrc/plugins/coreplugin/fileiconprovider.cpp
- src/plugins/coreplugin/fileiconprovider.h 5 additions, 1 deletionsrc/plugins/coreplugin/fileiconprovider.h
- src/plugins/coreplugin/generalsettings.cpp 2 additions, 2 deletionssrc/plugins/coreplugin/generalsettings.cpp
- src/plugins/coreplugin/mainwindow.cpp 1 addition, 1 deletionsrc/plugins/coreplugin/mainwindow.cpp
- src/plugins/coreplugin/manhattanstyle.cpp 5 additions, 3 deletionssrc/plugins/coreplugin/manhattanstyle.cpp
Loading
Please register or sign in to comment