aboutsummaryrefslogtreecommitdiffstats
path: root/dist
Commit message (Collapse)AuthorAgeFilesLines
* Installer/Mac: Add missing config fileEike Ziller2013-06-201-0/+15
| | | | | Change-Id: Ib36e02b526ddd9501efcc3907ac69d6e2664f4ac Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Make it possible to build Qt Creator installers on Mac tooEike Ziller2013-06-191-1/+1
| | | | | Change-Id: Ic3e6f773cb0c2c41f83c6f8d54ed4e0151c69b40 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Installers: Use standard license agreement textsEike Ziller2013-06-192-16/+0
| | | | | | | | The way it was done is deprecated in IFW 1.3 and removed in 1.4, and there's no reason for us to use non-standard texts. Change-Id: I05ef4974a3f47bd8ffe0bb3b1a226adac48aa954 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* fix locked DMG after installing Qt OSX package and starting creatorTim Jenssen2013-06-181-1/+1
| | | | | | | | | - the workingdir was inside the dmg so it couldn't unmounted Task-number: QTBUG-28963 Change-Id: I183098108743d9cc0bd00fb6bfaa3e5755c08191 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Change log fixes.Eike Ziller2013-05-301-5/+2
| | | | | Change-Id: I1edcf513d8d22dfc5abd87d0f339ea9d0b4015ca Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Add 2.8 changes fileEike Ziller2013-05-301-0/+231
| | | | | | Change-Id: I47121fcce1c063a6a0af82ebac080f843d2d157f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* GDB Makefile: added define for SOL_IPV6David Schulz2013-05-024-36/+40
| | | | | | | Added in the ipv6 patch. Change-Id: I2d6257b9deb1f1fdec85dd89d799e69b04b1a462 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-04-301-1/+2
|\ | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
| * Mac: Deploy and patch qml imports and qml2puppetEike Ziller2013-04-301-1/+2
| | | | | | | | | | | | | | | | | | | | The patching of imports and plugins is done automatically by macdeployqt, we need to pass it the qml2puppet executable though. Also add Qml2Imports to the qml(2)puppet's qt.conf. Task-number: QTCREATORBUG-9136 Change-Id: I9cb21d104f4c0c42531facfc6bc92fa9663e95a9 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | GDB: Fix Makefile for LinuxChristian Stenger2013-04-291-1/+1
| | | | | | | | | | Change-Id: I5e20bd4e335c1cd9e0ffeb07dd8fdf1f5d4747ac Reviewed-by: David Schulz <david.schulz@digia.com>
* | Debugger: Remove gdb-work-around-trk-single-step.patchhjk2013-04-112-24/+0
| | | | | | | | | | | | | | Symbian is gone, and so is TRK. Change-Id: I058e02d8990c5de0b9aa2f29ba7caebc30148f6d Reviewed-by: David Schulz <david.schulz@digia.com>
* | clean up installscript.qsTim Jenssen2013-03-251-33/+33
| | | | | | | | | | | | | | | | | | This makes code sharing between the Qt SDK Qt Creator component and the standalone one much easier. Change-Id: I9573ef24054d88dcabfa89666703f6eada29140c Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-03-183-0/+47
|\| | | | | | | | | | | | | Conflicts: doc/src/debugger/qtquick-debugger-example.qdoc Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
| * show LaunchQtCreatorCheckBox at the standalone installerTim Jenssen2013-03-133-0/+47
| | | | | | | | | | | | | | | | Some code was there but the ui file and the showing code was missing. Change-Id: I9a865ff7a10995d3b129e0b18c2f250bca852f9e Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-03-082-2/+0
|\| | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9
| * remove unsupported tag MaintenanceTitleTim Jenssen2013-03-052-2/+0
| | | | | | | | | | | | | | | | | | Newer versions of the installer framework continue only with supported tags inside the installer config.xml file. Change-Id: I87c0e8f079023b5ba7cf7cca248e1fa310b7a97e Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Debugger: GDB build script update python url.David Schulz2013-03-071-1/+1
|/ | | | | Change-Id: I1f4c85edcb5c5cad384fcf595b3f99bec7615ebb Reviewed-by: David Schulz <david.schulz@digia.com>
* Doc: rearrage change logLeena Miettinen2013-03-041-18/+19
| | | | | | | | Fix product names for QNX. Add information about some bugs. Change-Id: Iccfd8b98754b9e23f5d7f5bd8e189b511353bb6f Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Doc: Reorganize VCS entries in change logLeena Miettinen2013-02-281-22/+19
| | | | | | | Use dialog and menu item names correctly. Change-Id: I1aa80481ece0c340fbf88be940fd5bc55a85d06b Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* changes-2.7.0: entries for QmlJS changes, terminal supportFawzi Mohamed2013-02-261-1/+13
| | | | | Change-Id: I3988d220ad2fd7d68c6f1cc8ba6caf933f50dfe0 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Doc: make change log entries for Help more informativeLeena Miettinen2013-02-261-2/+4
| | | | | Change-Id: I4b4294c3fcb0eb9dfc8b9f73040d4fae80944d8b Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Doc: add information about QML changes to the change logLeena Miettinen2013-02-261-2/+4
| | | | | | | | So that users don't have to read the bug reports to understand what was changed. Change-Id: I52020ebdbe492e8278fcf2b5f5bdbedb89c3f275 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Doc: remove fixes from change log that fix regressionsLeena Miettinen2013-02-251-1/+0
| | | | | Change-Id: I4be04b05063320687e7c174c7f0e513f03c062d4 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Doc: new options for pointers and referencesLeena Miettinen2013-02-251-0/+3
| | | | | | | | This change log entry was lost during a merge conflict. Change-Id: I2d89abcbc2aa546377a08828bb9f706cdd029414 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Doc: reorganize items in the 2.7 change logLeena Miettinen2013-02-251-21/+22
| | | | | | | | | | | Move two debugging items from "C++ Support" to "Debugging". Create subsections for "Code completion" and "C++11 support" in "C++ Support". Try to list related items together. Change-Id: Id3cb1ac54ac1226adbc7a5d0413f6a5142f3365d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Doc: use the same terminology as in the ManualLeena Miettinen2013-02-251-1/+1
| | | | | Change-Id: I2df164796febdb71d522407b792a5a626fe41fc3 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Doc: use the same terminology as in the ManualLeena Miettinen2013-02-221-1/+2
| | | | | | | Add a refactoring action that was also added. Change-Id: I3f400a8003961714a5b650e75cb061fa983e5983 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Doc: new ways of managing breakpointLeena Miettinen2013-02-221-6/+6
| | | | | | | Describe breakpoint settings in more detail. Change-Id: I03a9f888fa29c3539f2ed6658f915da5c4c3adc9 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Doc: experimental Qbs supportLeena Miettinen2013-02-201-3/+3
| | | | | Change-Id: Id82e6fdc67a4794921f1a87def7ea0dae619c336 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Require 1.7.2Orgad Shaneh2013-02-201-0/+1
| | | | | | | | Remove legacy code Change-Id: I0ce03f7a34c92b48ceb705a0feec43e0ba89ef5c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Changelog: Add submit editor refresh featureOrgad Shaneh2013-02-151-0/+2
| | | | | Change-Id: I14e869ee4115062e7016dc5cd9e1a165a4599c5b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Removed duplicate lines from changes fileRobert Loehning2013-02-151-3/+0
| | | | | Change-Id: If160b9b164369b300bf02ae1bb68ea756261dbb7 Reviewed-by: hjk <hjk121@nokiamail.com>
* Fixed typoRobert Loehning2013-02-141-1/+1
| | | | | Change-Id: Iaec6b27f1cd62e9126112a6babe388bcf4fca4f3 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Changelog: Fix typohjk2013-02-081-1/+1
| | | | | Change-Id: I01afa456b9d43cae5274c9e1f17285332c870e09 Reviewed-by: hjk <hjk121@nokiamail.com>
* Doc: replaced Geek with EnglishLeena Miettinen2013-02-081-1/+1
| | | | | | | 'grok' is not general usage. Change-Id: I17f40bf487d9d271dabb11613508eff77934a908 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: make change log entries more informativeLeena Miettinen2013-02-081-13/+16
| | | | | Change-Id: I9eb5abdf608109714f41740ae9c00a4b8a81cbee Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Add ChangeLog for Qt Creator 2.7hjk2013-02-071-0/+313
| | | | | Change-Id: Ifadc3241b7715530d688508b79a1ce58eac77427 Reviewed-by: hjk <hjk121@nokiamail.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-312-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-292-2/+2
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-291-0/+129
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tips.cpp src/plugins/coreplugin/versiondialog.cpp src/plugins/projectexplorer/kitinformationconfigwidget.cpp src/plugins/qnx/blackberryapplicationrunner.cpp src/plugins/qnx/blackberrydeployconfiguration.cpp src/plugins/qnx/blackberrydeployconfiguration.h src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
| * Add changes-2.6.2v2.6.2-rchjk2013-01-291-0/+129
| | | | | | | | | | | | Change-Id: I032255ba1d07103cf7f81cf88811fdc023101163 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-161-0/+166
|\| | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/android/androidrunner.cpp src/plugins/projectexplorer/kitmanager.cpp Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6
| * Add changes file for 2.6.1Eike Ziller2012-12-191-0/+166
| | | | | | | | | | Change-Id: I0ea5f140fa6f973813d55bed0009dfb800466c40 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-12-181-0/+1
|\| | | | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/gdb/gdboptionspage.cpp src/plugins/fakevim/fakevimoptions.ui src/share/share.qbs Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
| * qmlpuppet: Point it to deployed Qt plugins as well.Eike Ziller2012-12-171-0/+1
| | | | | | | | | | | | | | | | | | With Qt5 qmlpuppet needs to find a platform plugin. Task-number: QTCREATORBUG-8447 Change-Id: I701d17da7f68dfcdfaeda171e2421488462692eb Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-12-143-1/+79
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/qt4projectmanager/qt4buildconfiguration.cpp src/plugins/qtsupport/baseqtversion.cpp Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
| * Allow the user to choose to associate common file types.kh12012-12-073-1/+79
| | | | | | | | | | | | | | | | | | | | | | Especially important if you already assigned the file types to a different application, or to keep defaults for VS users. Depends on: https://codereview.qt-project.org/#change,38650 Change-Id: I2b272c25e03bcc264ca73450fd26aa82ec30c296 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-11-301-17/+25
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/editormanager/openeditorsview.cpp src/plugins/debugger/qml/qmlengine.cpp src/plugins/debugger/qml/qmlinspectoradapter.cpp src/plugins/qtsupport/exampleslistmodel.cpp src/plugins/qtsupport/exampleslistmodel.h src/plugins/welcome/welcomeplugin.cpp Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
| * Make sure we register Creator with a proper ProgId.kh12012-11-301-17/+25
| | | | | | | | | | | | | | Depends on: https://codereview.qt-project.org/#change,38650 Change-Id: Idbd91ec7873286fe4a371c6c9dcebddece4acf45 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-251-4/+13
|\| | | | | | | | | | | | | | | Conflicts: share/share.qbs tests/auto/icheckbuild/icheckbuild.pro Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6