Eike Ziller
|
0ddb6cac29
|
Merge remote-tracking branch 'origin/3.0'
Conflicts:
src/plugins/qmakeprojectmanager/qmakeproject.cpp
Change-Id: Id6ac9051d2564788bb180e5a99243d588312ae99
|
2013-10-30 13:34:46 +01:00 |
|
Tobias Hunger
|
52a561c915
|
Qmake: Misc qt4 to qmake renamings
Change-Id: I47875935101b7560ad64c8a8c27d821c9810b388
Reviewed-by: hjk <hjk121@nokiamail.com>
|
2013-10-29 18:37:29 +01:00 |
|
hjk
|
7ce22266de
|
QmakeProjectManager: various renaming cleanup
Change-Id: I0433317d03aefb8e175f2208ca7ae29fa3e9fa49
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
2013-10-29 18:12:12 +01:00 |
|
hjk
|
d7d27fccbc
|
Rename plugins/qt4projectmanager to qmakeprojectmanager
This finally renames the plugin itself.
Change-Id: Ibdf4f4b4e9776c2fdc809e0127f3e1310de44bd1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
2013-10-29 17:57:06 +01:00 |
|