OSDN Git Service

ProjectExplorer: Change how .shared settings work
authorLeandro Melo <leandro.melo@nokia.com>
Tue, 4 Oct 2011 12:54:24 +0000 (14:54 +0200)
committerEike Ziller <eike.ziller@nokia.com>
Thu, 6 Oct 2011 10:56:31 +0000 (12:56 +0200)
commit1ee5418aee31959d280b66418d090a8f75abdb9a
tree22d45dc8d8903e61271e1e6d1fd1ee5c23f7aed0
parenta3dc0755f029625e36ea686aa0491ac3947107b5
ProjectExplorer: Change how .shared settings work

After discussing the subject we have opted to not automatically track
and synchronize shared settings. The current use case is that one
needs to manually created/edit a .shared file and place it under the
project's directory. We then identify such settings and merge then
into the user ones. Whenever the user changes such a setting in a way
it differs from the .shared value we mark it as a sticky setting.

Change-Id: I1a7196acea5fb76c3ba21ce950a7bfd1aa774da3
Reviewed-on: http://codereview.qt-project.org/5985
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
(cherry picked from commit 97e9399130baa95e11c34144f9f31b3c97b9a2dc)
src/plugins/projectexplorer/project.h
src/plugins/projectexplorer/projectexplorerconstants.h
src/plugins/projectexplorer/settingsaccessor.cpp
src/plugins/projectexplorer/settingsaccessor.h