diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-11-18 10:16:49 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-11-18 10:16:49 +0100 |
| commit | fbd47e25ee1578bcd83ec09be82c2a65a83d791a (patch) | |
| tree | 913a42cd88a7710361099bd345f456e77ba48d4e /src/plugins/qt4projectmanager/wizards | |
| parent | 826354e3da57a503322883e6a52db5329af8db10 (diff) | |
| parent | a8a170a4d40d7dc77b71ba12714346735878f194 (diff) | |
| download | qt-creator-fbd47e25ee1578bcd83ec09be82c2a65a83d791a.tar.gz | |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
qtcreator.pri
share/qtcreator/templates/qtquickapp/main.cpp
src/plugins/analyzerbase/analyzermanager.cpp
src/plugins/qmlprofiler/qmlprofilertool.cpp
Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4
Diffstat (limited to 'src/plugins/qt4projectmanager/wizards')
| -rw-r--r-- | src/plugins/qt4projectmanager/wizards/qtquickapp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp index a2cf2171fc..c9453a9073 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp @@ -466,7 +466,7 @@ QString QtQuickApp::componentSetDir(ComponentSet componentSet) const } } -const int QtQuickApp::StubVersion = 18; +const int QtQuickApp::StubVersion = 19; } // namespace Internal } // namespace Qt4ProjectManager |