summaryrefslogtreecommitdiff
path: root/dist
Commit message (Collapse)AuthorAgeFilesLines
* OS X: Add background image to installer and update imagesEike Ziller2014-11-243-1/+1
| | | | | | | | | "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>
* ChangeLog: Update recent VCS fixesOrgad Shaneh2014-11-061-1/+19
| | | | | | Change-Id: I43009c13ffac3c8f01d23e7c3e8ece12bf4bb284 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Change log additionsv3.3.0-beta1Eike Ziller2014-10-291-3/+79
| | | | | Change-Id: I0a9f654743a22708ec48bad55edb1c6af71d7551 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Remove src/libs/zeroconfhjk2014-10-201-0/+3
| | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-146-15/+233
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add changes file for 3.2.2v3.2.2Eike Ziller2014-10-101-0/+42
| | | | | | | | | | Change-Id: Ibb20ea1a28681bb1037e941c1dd2c2d5575b9513 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * License updateEike Ziller2014-10-095-15/+191
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | New Qt Creator logoAlessandro Portale2014-10-091-0/+0
| | | | | | | | | | Change-Id: If00ef246081b72d4f5cc64efb529461c53fb0d23 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Added changes-3.3.0 filehjk2014-09-291-0/+74
|/ | | | | Change-Id: I5b3b0595f9d33f3c0e419cc01612295564307d39 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Add changes file for 3.2.1Eike Ziller2014-09-151-0/+48
| | | | | Change-Id: I43a7d8d5bfcef33ef7e2370cafec3c409fd9ce25 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* OSX: Fix deployment of qml puppetsEike Ziller2014-08-221-4/+0
| | | | | | | They are no longer app bundles Change-Id: Ia2b9c62d478ae4ccacb20dc20eda44695d0fe960 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* GDB: Upgrade to 7.8Orgad Shaneh2014-08-183-21/+21
| | | | | Change-Id: If68a6b17b624c5093d4f1aaaae55db35a654a4fb Reviewed-by: hjk <hjk121@nokiamail.com>
* Add more change logEike Ziller2014-07-241-0/+11
| | | | | Change-Id: I639ca89aece386d1609966d0309c717baaf16f17 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Changelog: Added entries for BeautifierLorenz Haas2014-07-161-0/+5
| | | | | Change-Id: Ie3f177847223a8edd744753f7b349fa7ba31d57d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Changelog: Remove duplicate entries in C++Orgad Shaneh2014-07-141-7/+4
| | | | | | | | + fix 1 description Change-Id: I70f7ac0651b11cdc2b9fedff35d3da8ced4e888e Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* ChangeLog: Mention fixed tooltipshjk2014-07-111-0/+1
| | | | | Change-Id: I398c43f429cb0f0a837cd0a6eaaf8cf75ca4c2f5 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* ChangeLog: C++ SupportNikolai Kosjar2014-07-101-1/+15
| | | | | Change-Id: Ic99bd189c081d3bf436d78ee03bd27d2acf646b9 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* More change logEike Ziller2014-07-081-7/+129
| | | | | Change-Id: Ic8309c7c92a380876d337ba9a2d98d074fa8280a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* ChangeLog: Add some more changesOrgad Shaneh2014-07-071-0/+14
| | | | | | Change-Id: I97dce495081849c92b7bba50f9008da4e7429cad Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* ChangeLog: Add baremetal, fakevim, debuggerhjk2014-07-031-7/+53
| | | | | Change-Id: I5e2555158a9b24593b79a41c52c0b7a5139971ae Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* More changelogEike Ziller2014-07-021-1/+20
| | | | | Change-Id: I2bcd1ef3f1b08b0b35f19bd488c4fc7ef8ffbdb4 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Start on a changes file for 3.2Eike Ziller2014-06-161-0/+64
| | | | | Change-Id: I92a8dc68521fdd9aa9e47675db65b7b582d1550c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-06-132-3/+52
|\ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/shared/qbs Change-Id: Iba59e41db72e2afdf594f1f7003215d7d8d1e6d3
| * packaging: fix qt.conf for ios toolsFawzi Mohamed2014-06-121-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Add changes fileEike Ziller2014-06-121-0/+52
| | | | | | | | | | Change-Id: If5e742f658602e5254a9350902342f8452934674 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-05-201-0/+52
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/ios/iosdeploystep.cpp Change-Id: I97c80d288d7af30f4bf64509a09e0fe2e3b85f6f
| * Add changes file for 3.1.1Eike Ziller2014-05-191-0/+52
| | | | | | | | | | Change-Id: Id32ed8816ee8f67ffde1daaee3fd5c2d83448f95 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-05-163-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | 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
| * Upgrade to GDB 7.7.1Orgad Shaneh2014-05-083-3/+3
| | | | | | | | | | Change-Id: Id705cb577171386f1d313adb751541787c9c6ce2 Reviewed-by: hjk <hjk121@nokiamail.com>
* | Clean some trailing whitespaceOrgad Shaneh2014-05-071-1/+1
| | | | | | | | | | Change-Id: I71bb0436ff06cb8981bf465ef42640b622a9f2bc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-04-031-1/+13
|\ \ | |/
| * More changelogEike Ziller2014-04-021-1/+13
| | | | | | | | | | Change-Id: I7088ac84ae840c9e1dc83ff667938447406cc607 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-04-021-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/qtsupport/qtversionmanager.cpp src/shared/qbs Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2
| * Changelog: Add an entry for Git Show header changeOrgad Shaneh2014-04-011-0/+1
| | | | | | | | | | | | Change-Id: I6cdea03f2ebe372dfcd758f927a4adbcf3f96f60 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Add appdata.xml fileNiels Weber2014-04-011-0/+28
|/ | | | | | | | See http://people.freedesktop.org/~hughsient/appdata/ Change-Id: Idb30ddd17b80a0f606aa42f062b76905f11446b5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* ChangeLog: Add some more changesOrgad Shaneh2014-03-041-0/+2
| | | | | Change-Id: I51eb77abd8f6903408336a47396d54a7eda7331f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Update changes-3.1.0Eike Ziller2014-03-031-20/+96
| | | | | Change-Id: I81a3f5751be653c15ebef8efbbeaa716c2fdb390 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* CustomWizard: Use object pool to find factoriesTobias Hunger2014-02-171-0/+1
| | | | | | | | | | | Rename class type of CustomQmakeProjectWizard from "qt4project" to "qmakeproject" and document that change in the manual and changes-3.1.0. Also update all the in-tree xml files to that new class name. Change-Id: I7a9ef914a429d68e7f37a2115c03fa81d7433398 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Dist/gdb: Upgrade to GDB 7.7 and libexpat 2.1.0Orgad Shaneh2014-02-163-6/+6
| | | | | Change-Id: I025c236dcd270cef52b8c1a3cc25eac55cdbc849 Reviewed-by: hjk <hjk121@nokiamail.com>
* Update changelog for 3.1.0Orgad Shaneh2014-02-111-0/+7
| | | | | | Change-Id: I0919dbaeaf52504b342f7b5943dba6e1693be69a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-02-111-0/+70
|\ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/shared/qbs Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
| * Add changes file for 3.0.1Eike Ziller2014-02-051-0/+70
| | | | | | | | | | Change-Id: I2be8c105fcde044b73f3f24be6db560f71524fe5 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | More changes-3.1.0Eike Ziller2014-01-211-0/+26
| | | | | | | | | | Change-Id: I9f1af9662df781dc2a89149f7229133f844e5f3b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-151-3/+24
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp src/plugins/qmlprofiler/qmlprofilertraceview.cpp Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352
| * More change logEike Ziller2014-01-081-3/+24
| | | | | | | | | | Change-Id: I608811fa480a94e0e3d65fbfb24d2425e7b4049d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Add changes file for 3.1Eike Ziller2014-01-141-0/+85
|/ | | | | Change-Id: I4c1603d2cb8da8ae5e89781529277f9a5177ed3e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-082-2/+2
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Doc: Fix linkOrgad Shaneh2013-12-131-1/+1
| | | | | Change-Id: I6a6c4b12a81377879d5f6e00fd20def98924a41a Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Changelog: Update VCS changesOrgad Shaneh2013-12-091-0/+12
| | | | | | | Mostly Git Change-Id: Id4471cfd26ca7832aa081fb29495d4e6f020f7b8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* install x86 vcredist only if it is necessaryTim Jenssen2013-12-031-1/+8
| | | | | | | Change-Id: I7d3b3aa35ceef3502c6b4250b60a572631a117be Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>