summaryrefslogtreecommitdiff
path: root/dist
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-113-4/+28
|\ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbp src/libs/ssh/sshconnection.cpp Change-Id: I2946cbec1b5159eef9e47949860b28fba1e51529
| * Use same default installation directory as before.Eike Ziller2012-10-111-1/+1
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-8009 Change-Id: I16135a0195cd068cb2feddbe0bc9ed2de5c31dba Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com>
| * disable component selection pagetjenssen2012-10-111-0/+1
| | | | | | | | | | Change-Id: I652fedc0094deb8c4c1d1f18ca9551f5c2a582dc Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * add norestart to vcredist installation commandtjenssen2012-10-111-1/+1
| | | | | | | | | | Change-Id: Id563ef4f7e696e6b3f9474852de5e55936e02bce Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * Fix installation directory and add version to title.Eike Ziller2012-10-102-3/+26
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-7991 Change-Id: I4874527fc07040dea803bf50e1e4c335d9eb6810 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-091-1/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/fileiconprovider.cpp src/plugins/cppeditor/cppplugin.cpp tests/auto/qml/qmldesigner/coretests/coretests.pro Change-Id: I0e83becf661ded9316ce6766786c9ef4c2f897a7
| * More Nokia -> Digia/QtProject changesEike Ziller2012-10-091-1/+1
| | | | | | | | | | Change-Id: If52505dbc95ee48ac3467cdfbbea91629c11089c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-092-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/fileutils.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/genericdirectuploadservice.cpp src/tools/qtcreatorcrashhandler/main.cpp Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
| * Fix remaining URLs and a few other things that still referred NokiaEike Ziller2012-10-091-1/+1
| | | | | | | | | | Change-Id: I1c85bae3a1ada7a281fedd6951b35e6a4da395e6 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * Install VS redistributable on Windows.Eike Ziller2012-10-081-1/+2
| | | | | | | | | | Change-Id: I0669ae1e2aacb0088af8619c19a54a16fa568ea3 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-052-40/+49
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessageloghandler.h src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/madde/maemodeployconfigurationwidget.h src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentinfo.h src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/ichecklib_global.h tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h tests/manual/ssh/tunnel/tunnel.h Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
| * Adjust license headershjk2012-10-052-40/+49
| | | | | | | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Merge origin/2.6Eike Ziller2012-10-051-9/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/fileutils.cpp src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h src/plugins/cmakeprojectmanager/cmakeproject.cpp src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp src/plugins/cmakeprojectmanager/makestep.cpp src/plugins/qtsupport/baseqtversion.cpp Change-Id: I153295bad2d97609d96d28945e9f942c5b46b2da
| * Remove special characters from installer licenseEike Ziller2012-10-051-9/+9
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-7954 Change-Id: Ib188f80994ceea252bba02d1e6ac2b0f32a84157 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-0410-3/+710
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: dist/gdb/Makefile.osx src/libs/qmldebug/qmldebug.qbs src/plugins/android/androidsettingswidget.cpp Change-Id: I85627130b575f7d08f416dea52031fa72019b217
| * GDB build: Remove symbian targetOrgad Shaneh2012-10-043-3/+3
| | | | | | | | | | Change-Id: Id15d42d9447221be85baff92d08823d3fff4c3da Reviewed-by: David Schulz <david.schulz@digia.com>
| * Add installer target.Eike Ziller2012-09-287-0/+707
| | | | | | | | | | | | | | Requires Qt Installer Framwork (IFW) Change-Id: Id78c05f86cc104d29d4ed3ba02baefa20d49fe4f Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Debugger: Fix gdb makefile for Ubuntu >= 11.10David Schulz2012-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | Since Ubuntu 11.10 the linker option --as-needed is default, which causes a build failure. https://wiki.ubuntu.com/OneiricOcelot/ReleaseNotes#GCC_4.6_Toolchain Fixed by passing "-Wl,--no-as-needed" to the linker. Change-Id: Iea1db17d0930e4d4d08fa1e80ec594faa1ab2031 Reviewed-by: hjk <qthjk@ovi.com>
* | Debugger: Using gdb 7.5 in build scripts.David Schulz2012-09-244-120/+35
|/ | | | | | | | | | Adjusted makefiles and patches. squashed some changes from orgad: https://codereview.qt-project.org/#change,35419 Change-Id: I380e0199f1dca971b6018f6501e87070ee79fc76 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: hjk <qthjk@ovi.com>
* Added more resource editor improvements and fixed wording.Konstantin Tokarev2012-09-181-1/+3
| | | | | | Change-Id: Ic98a37742e0def1e75da35c7cd469426f4c3808d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Changes: mention some debugger and fakevim related itemshjk2012-09-111-11/+45
| | | | | Change-Id: Ifcea35fc39c06c095ecc03d129246d6d6538dd30 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* changes-2.6.0: Fix nameKai Koehne2012-09-111-1/+1
| | | | | Change-Id: I031e9be42f111450b6a66509d158d0ef92f8d8f9 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Changes: Mention merging of QmlJSInspector into Debugger pluginv2.6.0-betaKai Koehne2012-09-101-0/+4
| | | | | Change-Id: I5e04b0f24c56427e30e380e844729ca98111f1e2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* Update changes file.Eike Ziller2012-09-071-11/+154
| | | | | | | First run-through Change-Id: Ifba29d76ee5f35d45ffd8770ff8aec66d21afa2b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* Merge remote-tracking branch 'origin/2.5' into 2.6Eike Ziller2012-08-201-0/+13
|\ | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/progressmanager/progressmanager_win.cpp Change-Id: I7c5168894bd202f9fec8fd3278fad8c3b4f4449c
| * Add changes file for 2.5.2v2.5.2Eike Ziller2012-08-081-0/+13
| | | | | | | | | | Change-Id: Ied30b5449b638ff198d9fe8296aa5a0f38c9075e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* | Madde: Remove support for generic MeeGo.Christian Kandeler2012-08-011-0/+3
| | | | | | | | | | | | | | | | | | Platform is dead, no known users, not tested in ages (and no resources to do so). Change-Id: I6f4f913d9379010a3d4abc2728d9ab4425a32bc3 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: hjk <qthjk@ovi.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-07-241-0/+35
|\ \ | |/ | | | | | | | | | | Conflicts: src/libs/cplusplus/cplusplus-lib.pri Change-Id: I430ec8c6dda4afad3aedb1bc47d3af64537cfe66
| * Add changes file for 2.5.1Eike Ziller2012-07-241-0/+35
| | | | | | | | | | Change-Id: I3d02ab9423eb9d55ddf79791ca0c7c4514bcf47f Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | | | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Debugger: Unset standard debug-file-directory.David Schulz2012-06-063-2/+5
| | | | | | | | | | Change-Id: Idefa4886a5c8c09dfa22ab5ee655aeae0ac9a1be Reviewed-by: hjk <qthjk@ovi.com>
* | Debugger: gdb makefile cleanupDavid Schulz2012-06-062-21/+2
| | | | | | | | | | | | | | Removed unused build target. Change-Id: Iafa8876ecb339330c54cdd51399f016ce7b6d1ea Reviewed-by: hjk <qthjk@ovi.com>
* | Debugger: edit build-id patch for gdb-7.4.1David Schulz2012-06-051-4/+4
| | | | | | | | | | Change-Id: I88e8581287631ea05e044e4725cb4062620d12c9 Reviewed-by: hjk <qthjk@ovi.com>
* | GDB build: Advance to 7.4.1Orgad Shaneh2012-05-256-27/+8
| | | | | | | | | | Change-Id: Ie9d24d879fde99a4fdf5698b4a535be04fd91d34 Reviewed-by: hjk <qthjk@ovi.com>
* | Debugger: add complete buildid patchDavid Schulz2012-05-151-54/+1443
| | | | | | | | | | Change-Id: Icc43086803b971c17563e70a979dc3ad95072bce Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-05-101-1/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbp src/plugins/find/treeviewfind.cpp Change-Id: Iaae61c98938df24bda5521a923303db89eb7f8fe
| * Fixing wrong prefix-dir in gdb makefile for osxDavid Schulz2012-05-081-1/+1
| | | | | | | | | | Change-Id: I0bbc9912c4dc88286252a2fd2b574fde81e8a4ad Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-04-273-49/+78
|\ \ | |/ | | | | | | | | | | | | Conflicts: doc/templates/style/style.css qtcreator.pri Change-Id: I5f4f5f191726883dae18cb760733a5e8e6bd4e7d
| * GDB build: Be more quietOrgad Shaneh2012-04-263-49/+78
| | | | | | | | | | | | Change-Id: I775ddc04e50b10d35993d1390bf8bd8e35f1dbbf Reviewed-by: David Schulz <david.schulz@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-04-264-10/+60
|\ \ | |/
| * Fix for --disable-werror in GDB makefile for mingwDavid Schulz2012-04-231-1/+1
| | | | | | | | | | Change-Id: Icfddecdb7ff3711786e11a897548acb432b0201f Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
| * Add Test for Python in GDB makefile for MinGWDavid Schulz2012-04-231-3/+14
| | | | | | | | | | | | | | | | | | | | Download python if necessary. Git ignore the python directory. Task-number: QTCREATORBUG-7305 Change-Id: I03fa3ea404b38e5541d3d0380eb4e0987ceaa811 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
| * Added --disable-werror to the GDB makefiles.David Schulz2012-04-233-5/+5
| | | | | | | | | | Change-Id: I652f1b08439ff7bb0b7b5b21459edeff31017e5a Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
| * Update changes filev2.5.0-rcTobias Hunger2012-04-231-2/+41
| | | | | | | | | | Change-Id: Ib92e679ef24c8dfd30e2a459d4da26769f542f15 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Oswald Buddenhagen2012-04-198-0/+2502
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/libs/utils/utils.qbs src/plugins/projectexplorer/miniprojecttargetselector.cpp src/plugins/qmljseditor/qmljseditor.qbs src/plugins/qmljsinspector/qmljsinspector.qbs Change-Id: Ib239d50c21cb06d3a8e821e03dc093552f40ffab
| * GDB build scripts: Suppress wget version infoOrgad Shaneh2012-04-161-1/+1
| | | | | | | | | | Change-Id: I603aa1ab540183cbc3ff344242abed59cb1cfe32 Reviewed-by: hjk <qthjk@ovi.com>
| * Added build scripts for GDBDavid Schulz2012-04-168-0/+2502
| | | | | | | | | | Change-Id: I7300952fa95337fd6f5bcdb7a88933e8c06538b1 Reviewed-by: hjk <qthjk@ovi.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-211-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljsdebugclient/qmlprofilereventlist.cpp src/libs/zeroconf/servicebrowser.cpp src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qmlprofilerengine.cpp src/plugins/qmlprofiler/qmlprofilertool.cpp src/plugins/qmlprofiler/qmlprofilertraceview.h src/plugins/qmlprofiler/tracewindow.cpp Change-Id: Ib5e7579efffe74f2bf6871690d1e398e1062f986
| * Changelog: Locator execute and debugger "Break on raise"Orgad Shaneh2012-03-201-0/+3
| | | | | | | | | | | | Change-Id: I7fb98ad20fdac0e1f0cf55a2d499fb210af645e4 Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-151-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: src/libs/qmljsdebugclient/qmlprofilereventlist.cpp Change-Id: Ic6251d47ecd032ea1db4fc58dc80e19b6e6cf23d
View Lorry Controller Status