feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
43,591 Commits 108 Branches 368 Tags
b13f964fd5403d15ece89f89f9823dd19a2bc459
Commit Graph

433 Commits

Author SHA1 Message Date
hjk
990135128f ChangeLog: Add some Debugger and FakeVim entries 
Change-Id: Iea7808d66ea40c5230f3742a24b0230eea73b32e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2015-03-24 15:21:07 +00:00
Kai Koehne
63cc0b052a Installer: Install Visual Studio 2013 runtime 
Change-Id: I1664aa1b1f35c4d17b373cfc5b1468299dc51e3c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-03-11 10:04:38 +00:00
Eike Ziller
1eeca66c29 Get rid of Gitorious links 
That service is discontinued, and we have our own mirror anyhow.

Change-Id: I8a45401e2c0c889d87c675a79ae16684d7c69a7a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-03-10 13:50:48 +00:00
Tobias Hunger
a65d0f884b Changes: Mention CONFIG+=journald to enable journald support 
Change-Id: Ib541ee82d5ff0c5917d6bffc96a6ea6c68065805
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2015-03-10 10:33:24 +00:00
Sergio Ahumada
2c876f7443 Update some more links to qt.io 
Change-Id: I043cf78f128dc8d99e3316b951cf91d2f6d6524a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-03-09 14:30:39 +00:00
Eike Ziller
86378da3be Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	src/plugins/debugger/debuggeroptionspage.cpp

Change-Id: I0282d66b16c14877d0131cccbe03573102b48bc3
 2015-03-05 13:28:15 +01:00
Eike Ziller
9b68aade38 Add changes-3.3.2 
Change-Id: I660fe06a7949817c7516b9870dde264ee5d2088c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2015-03-04 11:52:20 +00:00
Sergio Ahumada
3af3fe7ad3 Replace old qt-project.org wiki with wiki.qt.io 
Change-Id: Ie7518d57b62e3f0b9dc6c559fe4a8f5b0212bb43
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2015-03-03 09:35:41 +00:00
Eike Ziller
0efef6e3cd Add changes file for 3.4 
Change-Id: I1f56e6ad05b9bed7642b2a5827c27c824dec0aba
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2015-03-03 08:48:17 +00:00
Eike Ziller
767f0ef58b Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	doc/api/coding-style.qdoc

Change-Id: Id40eb253a2e3e2357276ee76085127da10597bdb
 2015-02-25 10:15:28 +01:00
Eike Ziller
567c6eb875 Add changes-3.3.1 
Change-Id: I56d0e82f69e604aca3dc65940218ed471d203516
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2015-02-19 10:16:46 +00:00
Sergio Ahumada
e84770b794 Adapt documentation URL 
Change-Id: I74963a9d4a729450341f4f7a4ae5b3583654ffb8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2015-02-18 12:38:23 +00:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01:00
Orgad Shaneh
f24cadab78 Dist/GDB: Upgrade to 7.8.2 
Change-Id: Icb5cc20329d51d7557ea6e939398263261ff3251
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-01-26 22:12:20 +01:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Robert Loehning
77fa568870 ++year in copyright template 
Change-Id: I0f2ae9d25a964c2feb9762fcd8ceca72a5f42d7e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-01-07 10:02:45 +01:00
Eike Ziller
487b05dba8 Adapt bugtracker URL 
Change-Id: I93a256f18e720edb0bcfc2b409c119abfdcf2a2b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
 2014-12-19 10:18:23 +01:00
Denis Shienkov
854fc303c0 Add target to build GDB for bare metal devices on Windows 
Change-Id: I6dd138213b72f2e84e3970d76065515c9f501cac
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2014-12-10 17:41:38 +01:00
Orgad Shaneh
8539d31cc6 Changelog: Add credits 
Change-Id: I17022a9d52fef5b4912e580e599a968f24a794dd
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2014-12-10 13:57:33 +01:00
Eike Ziller
c4971b6eff OS X: Add background image to installer and update images 
"Watermark" is not available on OS X
We have a new logo now

Task-number: QTCREATORBUG-13482
Change-Id: I01fdfb958bc67660a87a2c5a18f88613e7121aff
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2014-11-24 09:03:15 +01:00
Orgad Shaneh
884922d3ef ChangeLog: Update recent VCS fixes 
Change-Id: I43009c13ffac3c8f01d23e7c3e8ece12bf4bb284
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2014-11-06 12:43:36 +01:00
Eike Ziller
fd8d6e3c9a Change log additions 
Change-Id: I0a9f654743a22708ec48bad55edb1c6af71d7551
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-10-29 09:44:30 +01:00
hjk
8d8b45d35f Remove src/libs/zeroconf 
The code has been unused for a while and shows up in the static
analyzer.

Change-Id: I7b59be985d7e6e140eaee217978660b767e7b11c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-10-20 17:00:36 +02: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
34971be5cc Add changes file for 3.2.2 
Change-Id: Ibb20ea1a28681bb1037e941c1dd2c2d5575b9513
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-10-10 09:47:07 +02:00
Alessandro Portale
b1176b97dd New Qt Creator logo 
Change-Id: If00ef246081b72d4f5cc64efb529461c53fb0d23
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-10-09 15:43:28 +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
hjk
2407c29768 Added changes-3.3.0 file 
Change-Id: I5b3b0595f9d33f3c0e419cc01612295564307d39
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-09-29 10:25:41 +02:00
Eike Ziller
f6c2a27218 Add changes file for 3.2.1 
Change-Id: I43a7d8d5bfcef33ef7e2370cafec3c409fd9ce25
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-09-15 17:03:27 +02:00
Eike Ziller
e0b518b832 OSX: Fix deployment of qml puppets 
They are no longer app bundles

Change-Id: Ia2b9c62d478ae4ccacb20dc20eda44695d0fe960
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-08-22 12:44:47 +02:00
Orgad Shaneh
996a999b55 GDB: Upgrade to 7.8 
Change-Id: If68a6b17b624c5093d4f1aaaae55db35a654a4fb
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-08-18 15:14:06 +02:00
Eike Ziller
fc24fe726e Add more change log 
Change-Id: I639ca89aece386d1609966d0309c717baaf16f17
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-07-24 13:52:33 +02:00
Lorenz Haas
70b40d501e Changelog: Added entries for Beautifier 
Change-Id: Ie3f177847223a8edd744753f7b349fa7ba31d57d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-07-16 20:31:16 +02:00
Orgad Shaneh
051bccf89e Changelog: Remove duplicate entries in C++ 
+ fix 1 description

Change-Id: I70f7ac0651b11cdc2b9fedff35d3da8ced4e888e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-07-14 10:58:22 +02:00
hjk
6da19d072d ChangeLog: Mention fixed tooltips 
Change-Id: I398c43f429cb0f0a837cd0a6eaaf8cf75ca4c2f5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-07-11 10:24:42 +02:00
Nikolai Kosjar
fe9183a62b ChangeLog: C++ Support 
Change-Id: Ic99bd189c081d3bf436d78ee03bd27d2acf646b9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-07-10 15:32:19 +02:00
Eike Ziller
6059bd237a More change log 
Change-Id: Ic8309c7c92a380876d337ba9a2d98d074fa8280a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-07-08 12:20:14 +02:00
Orgad Shaneh
e7643e351c ChangeLog: Add some more changes 
Change-Id: I97dce495081849c92b7bba50f9008da4e7429cad
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-07-07 10:55:53 +02:00
hjk
e368699999 ChangeLog: Add baremetal, fakevim, debugger 
Change-Id: I5e2555158a9b24593b79a41c52c0b7a5139971ae
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-07-03 17:05:03 +02:00
Eike Ziller
f15208bc3a More changelog 
Change-Id: I2bcd1ef3f1b08b0b35f19bd488c4fc7ef8ffbdb4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-07-02 09:56:05 +02:00
Eike Ziller
e2d4da5a91 Start on a changes file for 3.2 
Change-Id: I92a8dc68521fdd9aa9e47675db65b7b582d1550c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-06-16 12:53:30 +02:00
Eike Ziller
2786250c17 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Iba59e41db72e2afdf594f1f7003215d7d8d1e6d3
 2014-06-13 10:51:51 +02:00
Fawzi Mohamed
ca3e082b35 packaging: fix qt.conf for ios tools 
Qt 5.3.1 does not set the profix only based on the use of QGuiApplication
but actually checks if the app is a bundle, so the Prefix hack in the
qt.conf for the ios tools is not needed anymore.

Task-number: QTCREATORBUG-12393
Change-Id: I6a228d83370bc62929ffd056b9b3051e4562485e
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-06-12 10:25:37 +02:00
Eike Ziller
06ba701fb0 Add changes file 
Change-Id: If5e742f658602e5254a9350902342f8452934674
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-06-12 10:18:49 +02:00
Eike Ziller
270e8fe537 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	src/plugins/ios/iosdeploystep.cpp

Change-Id: I97c80d288d7af30f4bf64509a09e0fe2e3b85f6f
 2014-05-20 14:44:31 +02:00
Eike Ziller
a0c7ee3520 Add changes file for 3.1.1 
Change-Id: Id32ed8816ee8f67ffde1daaee3fd5c2d83448f95
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-05-19 16:44:57 +02:00
Eike Ziller
6d1cc58697 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	src/plugins/clangcodemodel/test/clangcompletion_test.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/projectexplorer/projectexplorer.pro
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
	src/plugins/vcsbase/vcsplugin.cpp
	src/shared/qbs

Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
 2014-05-16 16:54:50 +02:00
Orgad Shaneh
93cdde544c Upgrade to GDB 7.7.1 
Change-Id: Id705cb577171386f1d313adb751541787c9c6ce2
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-08 09:37:12 +02:00
Orgad Shaneh
b9f79cbd01 Clean some trailing whitespace 
Change-Id: I71bb0436ff06cb8981bf465ef42640b622a9f2bc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2014-05-07 16:19:47 +02:00
Eike Ziller
d68f14ad5b Merge remote-tracking branch 'origin/3.1' 2014-04-03 10:16:14 +02:00