feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
38,691 Commits 108 Branches 368 Tags
d301fb42e91765ae829f7021c3b26ef159cadc9a
Commit Graph

568 Commits

Author SHA1 Message Date
Tobias Hunger
d301fb42e9 Git: Fix description of git status progress 
Remove color.status option. Creator can handle ANSI now, so there
is no need to suppress that for user-visible output anymore (Git
is intelligent enough to not print colors, even if we do not explicitly
ask it not to:-)

For the internal uses of git status: Prefer using --porcelain instead
of the -s format. That is meant to be stable and does not use colors
ever.

All supported git versions (>= 1.7.2) support --porcelain.

Task-number: QTCREATORBUG-13277
Change-Id: Idd88bcba0c4e4ed68bb27fbf475fe88fae497f1c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-11-10 11:17:44 +01:00
jkobus
2a9c9f2d70 Hide some diff editor controls when diff editor is bound to a file. 
Remove unnecessary anymore "ignoreWhitespace" argument
from functions which read a patch file.

Transfer the ownership of reloader into controller.

Task-number: QTCREATORBUG-13250
Change-Id: I68183005b845d6ece9ea2be9888abc8597310426
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2014-11-05 14:38:51 +01:00
hjk
a439483d70 Use QFileInfo::exist(f) instead of QFileInfo(f).exists() if possible 
Faster.

Change-Id: I91aa67462e11ff3258600d7f158de79942d0dc81
Reviewed-by: Marc Reilly <marc.reilly@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-11-03 09:31:28 +01:00
Orgad Shaneh
27b0fd81a0 Git: Do not show diff for all staged files when unstaged requested 
For example git rm somefile and modify another, then open the commit
editor and double-click the modified file.

Change-Id: I8c7044b4279192b95dcff4d63f48228ec4960f63
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2014-10-30 10:30:30 +01:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
 2014-10-14 15:36:16 +02:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Orgad Shaneh
5671676ff5 Git: Find renames and copies on Show 
Change-Id: I453956908bf4c99f42d1239cf793d3ea1c91fdde
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-10-06 10:49:30 +02:00
Orgad Shaneh
3f3554eb13 Git: Display exit message for conflictable commands 
Change-Id: I42d7a2e05a11ed4983063fc2577786e6c6d9b9a0
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-09-23 11:00:42 +02:00
Orgad Shaneh
20b836f59c DiffEditor: Simplify makePatch 
Store indices in controller and avoid passing them around.

Change-Id: I49c80cb6cf6734a18f80ad5c7c441973d246708f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-09-09 08:40:05 +02:00
Orgad Shaneh
ee2023ef65 Git: Deduplicate diff editor creation sequence 
Change-Id: I9d0751726f0acb340f9b19be62c6bbe23ec460f7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-09-08 15:09:02 +02:00
Eike Ziller
7224ccb2e7 Editors: Automatically add editor/document id to context and use that 
instead of manually adding a context everywhere.

Change-Id: I4336015a6d19349171a255e949da89b0013d6700
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-02 16:48:13 +02:00
hjk
5f7e89d914 Vcs: Some naming re-organization 
Rename VcsCommand to VcsCommandTag, Command into VcsCommand
(Too generic to not mistake for Core::Command IMNSHO),
remove the now unneeded namespace qualification when not needed,
adjust surrounding code.

Change-Id: Iceb18a21e5e6dffa1a622241286f766985bb8d22
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-28 16:37:00 +02:00
hjk
f08ff20e94 Vcs: Move some static functions from *EditorWidget to *Editor 
Change-Id: Ic7c0a3bca982f5728e28ff9f3e1e054b5a902ea9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-28 15:09:28 +02:00
hjk
4d082cee74 VcsBase: Use static pattern for VcsBaseOutputWindow 
Also rename to VcsOutputWindow.

Change-Id: I79547b1154603a8c7b3604eadc5b460930c6109c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-08-27 12:12:15 +02:00
hjk
6431ab2c79 Use Qt 5's QStringList::join(QChar) 
Less typing and less cycles than join(QString) where appropriate

Change-Id: I6ebc0e17e4d7fd9845864dd95b7de4ba4dad6906
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-08-25 08:21:14 +02:00
Eike Ziller
d9d0aba1c4 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/projectexplorer/editorconfiguration.cpp
	src/plugins/projectexplorer/projectfilewizardextension.cpp
	src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp

Change-Id: I8de0f6fcdd8d214fbc14e79f74cb0206e6e2c6c1
 2014-08-15 16:14:34 +02:00
Robert Loehning
eb1ce50779 Compile fixes for Qt 4.8 
Change-Id: Ie28d5901fe27fec4f928204296bf1013e10c556a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-08-13 17:32:36 +02:00
jkobus
ceedde8769 Try to show some meaningful diff when in merging state. 
Instead of showing 3-way diff, show simple diff
of conflicted file compared to the head of current branch.

Task-number: QTCREATORBUG-10099
Change-Id: I9419236f0249fd2752f89ea80a2a644fb80af095
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-08-13 16:53:24 +02:00
jkobus
0b1a49a66e Fix const correctness 
Change-Id: I40728827423ef0832640de2ebd2ad6d637fb4a5c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-08-13 16:45:52 +02:00
jkobus
87b5db5562 Save / restore state in diff editor when reloading 
Task-number: QTCREATORBUG-12650
Change-Id: I0bb25ed39f8a15dd5da798ebf0ce72898a2e3b3d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-08-13 15:44:36 +02:00
jkobus
a9f00ac145 GitClient: use "git show" for show instead of "git diff" 
Task-number: QTCREATORBUG-12755
Change-Id: Idc4427425a3ef3e70c8738f1062e20d50bab69ca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-08-13 14:24:58 +02:00
jkobus
afea017c80 DiffEditor: Fix double click inside commit editor 
The bug was that if you double-click a file
in the commit editor, then double-click another one,
the diff remains with the first one.

Change-Id: I1f49b549c9dfd3ebd4ec6950ed28dd8cbc7d0227
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-08-12 10:30:01 +02:00
Oswald Buddenhagen
f3a61e8bf7 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidglobal.h

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
 2014-08-05 14:24:23 +02:00
Orgad Shaneh
117436a65a DiffEditor: Use explicit DirectConnection for context menu 
The menu is expected to be populated after the signal is emitted.

Change-Id: Ibcb9eaf3742942801ad79b98000d48cb93d5ae31
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-08-04 09:26:32 +02:00
Orgad Shaneh
7a7690f0ec Git: Parse for-each-ref output as UTF-8 
Adding a branch with non-ascii chars then refreshing the branch list on
Windows invalidates the branch name.

Change-Id: I59d3e092c66fdcc7cea38a8451de6b5e42cd5de0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2014-07-30 09:12:44 +02:00
Eike Ziller
0374a9782e Merge remote-tracking branch 'origin/3.2' into HEAD 
Change-Id: I257bb9310bb3bde493aff4cd43091ec63fcb5203
 2014-07-22 16:11:40 +02:00
Orgad Shaneh
933fd51225 Git: Fix soft assertion on Abort Rebase 
When a rebase was initialized in a previous session or by
command-line.

Change-Id: I1a185f1bf1a9caeeba0d8358debc855cbd926d48
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-07-22 07:51:58 +02:00
Eike Ziller
c571ecbd51 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/plugins/git/changeselectiondialog.cpp
	src/plugins/git/changeselectiondialog.h
	src/plugins/git/gerrit/gerritplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/git/gitclient.h
	src/plugins/git/gitsettings.cpp
	src/plugins/git/gitsettings.h
	src/plugins/git/mergetool.cpp

Change-Id: Icd1b2741da96395ed1b41903f453049a303e4791
 2014-07-18 14:04:51 +02:00
Orgad Shaneh
febdfeb92f Git: Rename gitBinaryPath => gitExecutable 
Avoid confusion with gitBinDirectory

Change-Id: I335cf6bc82284e02e0652b057f0b80f292d6ddc0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-07-18 11:19:54 +02:00
Eike Ziller
bc823443ea Fix broken merge 
Change-Id: I21822285d2213a24ea80bb4a03c75a2cee5d4a9c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-07-17 12:55:01 +02:00
Eike Ziller
e7ea94b688 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/plugins/git/gerrit/gerritparameters.cpp
	src/plugins/git/gerrit/gerritplugin.h
	src/plugins/git/gitclient.cpp

Change-Id: Ie7719cfe45489b72d64260e729dcce3760f33bec
 2014-07-17 12:42:04 +02:00
Orgad Shaneh
71b56d2b9c Some QString -> FileName transformation 
Change-Id: I4a8a8f68bb1e52750380218793ec3029b488c01f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-07-16 12:44:01 +02:00
Orgad Shaneh
54db877297 Git: Factor out resolving of bin directory on Windows 
Change-Id: Ifbafa0f5cb8329faedfd1da3674b87e46001acc3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-07-16 12:43:32 +02:00
jkobus
5ebd59d12b Rename some methods and variables in DiffEditor 
Change-Id: Ic6db2882c9468b9451a785e4657e4255b40fca4c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-07-07 10:34:17 +02:00
jkobus
91e4271069 Hide reload button for diff editor when there is no reloader 
Refactor code a bit. Now DiffEditorController has a pointer
to DiffEditorReloader.

Change-Id: I224579127f112923bc665cd59717b0c4d833981b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-07-07 10:34:11 +02:00
Orgad Shaneh
0544f9dd05 Git: Replace findRepository with VcsManager::findTopLevel 
Take advantage of its cache

Change-Id: Ibf3b3b59821a92cd4475c6f8d6dd8212983d5c96
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-07-03 11:04:49 +02:00
Orgad Shaneh
7ba734162c Git: De-noise GitClient 
Change-Id: I9b001bd47af826a3c4611071ca0b3a0674079b01
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-07-03 10:21:10 +02:00
Orgad Shaneh
44f9e3678c Git: Fix double-clicking a diff chunk in Show invoked from Blame 
Change-Id: I31ba36245b8b62b9d1e3c4a9125dec5ce6610766
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-07-03 10:15:30 +02:00
Christian Kandeler
93304df038 Always pass Core::Id by value. 
Currently we pass in some places by value, elsewhere by const ref and
for some weird reason also by const value in a lot of places. The latter
is particularly annoying, as it is also used in interfaces and therefore
forces all implementors to do the same, since leaving the "const" off is
causing compiler warnings with MSVC.

Change-Id: I65b87dc3cce0986b8a55ff6119cb752361027803
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-07-01 11:52:08 +02:00
Orgad Shaneh
398872bcdc Git: Fix showing commits from rebase-todo editor 
We used to need the repository root in order to resolve the file.

This is no longer needed, since the raw patch is parsed instead.

Change-Id: Ifdbbcd686a5ef7bbbd472f37b20190b9e9abebe7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-06-30 11:19:33 +02:00
Orgad Shaneh
f3106ebafe Git: Use a separate thread for updating commit data 
Task-number: QTCREATORBUG-12449
Change-Id: I3057ca458272daac72c54abce1d6f9acf6a5d4af
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-06-24 12:00:22 +02:00
Orgad Shaneh
d6583f0f47 Git: Add on-demand branches expanding 
Make "branches expanding" on demand and asynchronous.
After "git show" there is clickable text: "Branches: <Expand>" in
description. If user clicks this text then branches for commit is
triggered and done asynchronously.

Task-number: QTCREATORBUG-11293
Done-with: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Change-Id: I772cfef823d3f95e2b3060dfb5973157d81fc11a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-06-24 11:19:28 +02:00
Tobias Hunger
836e17a57c Revert "VCS: Open diff/blame editors in other split" 
This change has lead to complaints about diff views opening
in apparently random places for users with several splits.

This reverts commit 02b3a79c5f.

Conflicts:
	src/plugins/diffeditor/diffeditorplugin.cpp
	src/plugins/subversion/subversionplugin.cpp

Change-Id: I2eab8ff2d88a9e12f4dc7ec3a9ca65455daf15e2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-06-17 15:40:40 +02:00
Orgad Shaneh
4df7656394 Git: Preserve author on cherry-pick 
Change-Id: Ib3184631145ed6c6eb72dd5b7c33e415fc0cc799
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-06-12 13:26:30 +02:00
Orgad Shaneh
e0196e38e2 Git: Replace string literal with constant 
Change-Id: I457d69f1eac9810e2746d9f544151e421c147fac
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-06-12 13:24:00 +02:00
jkobus
8cad94534f Implement unified diff editor 
Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-06-06 12:33:59 +02:00
Alessandro Portale
c3cb944eec Git: Native separators in GitClient::StashInfo::stashPrompt 
Change-Id: I5090d8eb8f5e262785735ced81a12b9473721204
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-06-03 14:58:38 +02:00
hjk
6e584b5b49 DocumentModel: Make interface static 
Move item model implementation to private, adjust user code.

Change-Id: Ifbe94e7c7b9b1e8be1b4c531958dbd7a9413af13
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-13 11:48:30 +02:00
Orgad Shaneh
642706dc44 VCS: Pass const values by references 
Change-Id: I9749c0c76b810f3d5fee1aa8c5750dac5930cd3c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-05-06 15:32:52 +02:00
Eike Ziller
0fb641c90e Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
 2014-05-02 10:00:20 +02:00