Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline (268d277d) · Commits · Marco Bubke / flatpak-qt-creator · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

flatpak-qt-creator
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

268d277d

Commit 268d277d authored 15 years ago by dt

Downloads
- Plain Diff

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

parents 96b495e4 5cd63974

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

src/plugins/debugger/debugger.pri 3 additions, 0 deletions

src/plugins/debugger/debugger.pri
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp 132 additions, 76 deletions

...ns/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h 70 additions, 27 deletions

...gins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp 0 additions, 30 deletions

.../qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h 0 additions, 11 deletions

...ns/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.h
src/plugins/qt4projectmanager/qt-s60/s60manager.cpp 76 additions, 28 deletions

src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
src/plugins/qt4projectmanager/qt-s60/s60manager.h 4 additions, 11 deletions

src/plugins/qt4projectmanager/qt-s60/s60manager.h
src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri 1 addition, 0 deletions

...gins/qt4projectmanager/qt4projectmanager_dependencies.pri
src/plugins/texteditor/basetexteditor.cpp 15 additions, 2 deletions

src/plugins/texteditor/basetexteditor.cpp
src/shared/trk/launcher.cpp 13 additions, 5 deletions

src/shared/trk/launcher.cpp
src/shared/trk/launcher.h 1 addition, 0 deletions

src/shared/trk/launcher.h
tests/manual/trklauncher/main.cpp 11 additions, 5 deletions

tests/manual/trklauncher/main.cpp

with 326 additions and 195 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment