OSDN Git Service

Merge app_version.h and ide_version.h
authorEike Ziller <eike.ziller@nokia.com>
Tue, 30 Aug 2011 13:57:00 +0000 (15:57 +0200)
committerDaniel Molkentin <daniel.molkentin@nokia.com>
Wed, 31 Aug 2011 11:48:00 +0000 (13:48 +0200)
commitbbfa7e002003f4f0dfd0db8e26e87c6a06b462e6
treeeffeb36105c703df757f9b8d7dfb5bb0b4580b53
parentb6835eaa8032d454eecedae5669a29f0e6c52f2c
Merge app_version.h and ide_version.h

Change-Id: I703d4704a3bdf88bd567c92512ee27db6aea043c
Reviewed-on: http://codereview.qt.nokia.com/3918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
19 files changed:
qtcreator.pri
src/app/app.pro
src/app/app_version.h.in [moved from src/plugins/coreplugin/ide_version.h.in with 65% similarity]
src/libs/utils/app_version.h.in [deleted file]
src/libs/utils/networkaccessmanager.cpp
src/libs/utils/utils-lib.pri
src/plugins/coreplugin/actionmanager/commandsfile.cpp
src/plugins/coreplugin/coreconstants.h
src/plugins/coreplugin/coreplugin.pri
src/plugins/coreplugin/coreplugin.pro
src/plugins/coreplugin/externaltool.cpp
src/plugins/coreplugin/mainwindow.cpp
src/plugins/coreplugin/versiondialog.cpp
src/plugins/help/helpplugin.cpp
src/plugins/help/localhelpmanager.cpp
src/plugins/macros/macro.cpp
src/plugins/projectexplorer/persistentsettings.cpp
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp