summaryrefslogtreecommitdiff
path: root/src/tools
Commit message (Collapse)AuthorAgeFilesLines
* iossim: correct bring to front for Xcode 6Fawzi Mohamed2014-09-231-4/+13
| | | | | | Change-Id: I7e161a20a4b24635df4f6f373966c7e52cfb593b Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* ios: simulator integration support for Xcode6Fawzi Mohamed2014-09-176-16/+596
| | | | | Change-Id: Ibe161281e7dcdbba2c19fb23fac0546f2e592ad2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* SdkTool: Fix warningsChristian Stenger2014-09-051-1/+2
| | | | | Change-Id: I2a16bdff7b184e0988d9147f01075c87f8eb1309 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* SdkTool: Fix "get" for complex typesOrgad Shaneh2014-09-051-1/+36
| | | | | Change-Id: I8dd8101e33da4a2bdb0bf36f4217f1c466583b47 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ios: Fix case in .pro filesRobert Loehning2014-08-212-2/+2
| | | | | | Task-number: QTCREATORBUG-12867 Change-Id: I4fcc1bdf74f1391f33fe99be16f8acbb9e049165 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Let Qbs handle Info.plist embedding.Jake Petroules2014-08-063-5/+5
| | | | | | | | | | For command-line applications, Qbs embeds the Info.plist by default if one is specified with the infoPlistFile or through other means. Task-number: QTCREATORBUG-11492 Change-Id: I5e40cb9c1461d6ba4c178c045930017449327af3 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* SDKTool: Change DeviceType from QByteArray to QStringOrgad Shaneh2014-08-043-16/+16
| | | | | Change-Id: I224b6723891df4a8073fae327def13c0b41e8541 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* C++: Check for Function::name() before using itNikolai Kosjar2014-07-171-48/+51
| | | | | | | | Lambdas do not have a name. Change-Id: Ifda4816c62dcfe19bdbb1649dc1caf408e056b37 Task-number: QTCREATORBUG-12686 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* SdkTool: Use Qt Creator doctypesOrgad Shaneh2014-07-0812-38/+40
| | | | | | | Simplify filename conversion while at it Change-Id: I0a7473aa42626a04214887f1cc82abe536233a78 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* SdkTool: Support adding kit for desktop deviceOrgad Shaneh2014-07-081-0/+4
| | | | | Change-Id: Ibaba86dd72655ec3734a7564ae9eec6c3c85df1f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* SdkTool: Use 1 as default origin in add deviceOrgad Shaneh2014-07-031-1/+1
| | | | | | | Origin corresponds to enum Origin { ManuallyAdded, AutoDetected } Change-Id: I18416351de729bf2bdefbba4134c9d50c01e98fe Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ios: increase simulator timeout to cope with slower machinesFawzi Mohamed2014-07-032-2/+2
| | | | | Change-Id: Idfb5da8dfd0be6bada2b7d318703b0d1b8d4b6b9 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* SDKtool: Remove duplicate conditionTobias Hunger2014-07-031-2/+0
| | | | | Change-Id: Icf44c2069b593bb3289b55510f51733d53e7507c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* SdkTool: Do not create additional pathOrgad Shaneh2014-07-031-1/+1
| | | | | | | Passing "-s test" created test/test Change-Id: I9cf5635596ea3361cde9142df6524dd684e062de Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* SdkTool: Fix capitalizationOrgad Shaneh2014-07-031-1/+1
| | | | | Change-Id: I1085dc89216ad37019227c967ddddbe999486cb1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Remove MakeSpy toolOrgad Shaneh2014-07-022-212/+0
| | | | | | | Ancient and unused Change-Id: I474173dd4471b1b3de43be861fefe2704604bb37 Reviewed-by: hjk <hjk121@nokiamail.com>
* iossim: correctly escape app outputFawzi Mohamed2014-07-013-32/+66
| | | | | | Task-number: QTCREATORBUG-12423 Change-Id: Id1acffbcd25d5886617651aa822657d680b80b4e Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-06-161-0/+9
|\ | | | | | | | | | | | | Conflicts: src/shared/qbs Change-Id: I9567aa9331c3674cdce50b940c3ec2b5def7bd3f
| * Allow sdktool to run in an elevated contextKai Koehne2014-06-131-0/+9
| | | | | | | | | | | | | | | | | | | | This fixes an issue with installation on Mac: We run sdktool with 'elevated' rights if we e.g. install in a global directory, forcing the effective user id to be 0. However, since Qt 5.3.0 QCoreApplication aborts if geteuid() != getuid(). Change-Id: I678f405fc0cb31dbf9c0487f674bb8dbe5e2e95e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | DiffEditor: Remake of the toolbar icons incl. @2x variantsAlessandro Portale2014-06-131-2/+130
| | | | | | | | | | | | | | | | The icons now have consistent positions and shadows, anti alias and a HiDPI variant. Change-Id: I7d3a9512113788c95a132a79a58c8f559f46d00e Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Icons for Qt Creator.Alessandro Portale2014-06-122-0/+1363
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In various eras, we collected images/icons in .png format from different sources. In some cases from hired designers, some contributors, and even some Qt Creator developers. That causes more or less subtle in consistencies ranging from color schemes to shadow directions. Now - in the era of High-Dpi - we suddenly need high resolution "@2x" versions of our graphics, but do not have the original graphics files to easily generate them. This approach here supplies many of the graphics in SVG, editable with Inkscape. Existing pngs are re-created as vector graphic. That way, the original graphics sources are finally public and version controlled. Also, we potentially get more consistent graphics and High-resolution versions. The shell script executes Inkscape to export the images and icons as pngs. Change-Id: Id426ee94b151833cd52e29a8234966aba9cd38bc Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Adam Strzelecki <ono@java.pl> Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | qbs build: fix usages of toolInstallDirJoerg Bornemann2014-05-232-3/+2
| | | | | | | | | | | | | | This amends 6706659bb16677dfb6ad408bd24b93b6dc917717. Change-Id: Ia9d6eaea92747a804bd5df130017cbf39f8bf6ad Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | C++: Use Token::utf16chars{Begin,End} where appropriateNikolai Kosjar2014-05-231-1/+1
| | | | | | | | | | | | | | | | ...especially in CppTools/CppEditor where the offsets are used with a QString/QTextDocument. Change-Id: Ic6d18fbc01fb9cc899a9bd2d7424cd2edae487f1 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | qbs build: adjust include path for iOS simulatorJoerg Bornemann2014-05-211-0/+1
| | | | | | | | | | | | | | The 3rd party lib needs "." in include paths. Change-Id: If5dc69298344e121fa597c9da884b31260a83ed5 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Tools: Fix install step for WinRT debug helperChristian Stenger2014-05-161-1/+1
| | | | | | | | | | Change-Id: I734a9556db7161c1d7bbe363a61de599078bfa34 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | WinRT: Enable debugging for local packages.David Schulz2014-05-165-3/+113
| | | | | | | | | | Change-Id: Ic04f1a471f951caf7a79c69cceecb0ebd5d09919 Reviewed-by: hjk <hjk121@nokiamail.com>
* | C++: Clarify units of a TokenNikolai Kosjar2014-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This will avoid confusion when later more length and indices methods are added. In Token: length() --> bytes() begin() --> bytesBegin() end() --> bytesEnd() Change-Id: I244c69b022e239ee762b4114559e707f93ff344f Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | Centralize addition of plugin library pathsOrgad Shaneh2014-05-081-1/+0
| | | | | | | | | | Change-Id: I9ddcc193b4d927c3d566eeb81c41f79a75920696 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Nuke plugins PROVIDER settingsOrgad Shaneh2014-05-082-2/+2
| | | | | | | | | | | | | | | | Place all plugins in lib/qtcreator/plugins Change-Id: I66606910104b28d91038f5607850ce03bdd1b80f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Use double quotes instead of single quotes as per our guidelines.Christian Kandeler2014-04-221-1/+1
| | | | | | | | | | Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-04-142-26/+55
|\ \ | |/
| * SDKtool: Fix adddevice operationTobias Hunger2014-04-111-1/+1
| | | | | | | | | | | | Change-Id: I7bd3813bab7a8006ab418990f0e742be7d6f400a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> (cherry picked from commit 0d303db8c2e79c772cd216bfc07b42637c37e1bd)
| * iostool: remove debug messageFawzi Mohamed2014-04-091-1/+0
| | | | | | | | | | Change-Id: I7c33924dbf46c77f9f384f108bc6b258f59a6d56 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
| * SDKtool: Only write values into kit that were set on the commandlineTobias Hunger2014-04-091-25/+55
| | | | | | | | | | | | | | | | | | Do not put empty values for settings into the kits: These will prevent data from being editable in Qt Creator. Task-number: QTCREATORBUG-12017 Change-Id: I10f67ed0038ba7e1a79cbf7b5658247a2d18b8eb Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | QmlDesigner: On demand compilation of the puppetMarco Bubke2014-04-091-19/+2
| | | | | | | | | | | | | | | | | | | | Before we had to provide the puppet in the packaging. Now we compile the puppet on demand so we can be sure it is always there in the right version and working. Task-number: QTCREATORBUG-11763 Change-Id: I8556ef677ed27fbcc8a7775dced60230104e3237 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-04-081-0/+29
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/cpptools/cppcompletion_test.cpp Change-Id: Ic5e75b3ef164de664a1449ffa8579beaf5b02521
| * SDKtool: Correctly handle mac ABIsTobias Hunger2014-04-071-1/+11
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-11983 Change-Id: Id70bd18b1b5494db19adb9928277356c4d4a4688 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * SDKtool: Fix test case and compiler warningTobias Hunger2014-04-041-0/+19
| | | | | | | | | | | | | | | | | | | | | | Do check for toolchains not defined in the toolchains.xml file again, but also allow for toolchain IDs to be ABIs. This partially reverts a commit from Kai made earlier. Change-Id: Idad004f0bff655bc136bc43de5837d61a045e311 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Eike Ziller2014-04-022-6/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/qtsupport/qtversionmanager.cpp src/shared/qbs Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2
| * sdktool: Fix addKit complaining about unknown toolchainsKai Koehne2014-03-311-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression in 07f7dd9c1434738ad59467ac8830be41db03dfa0 that caused the Qt SDK installer to complain e.g. with Toolchain x86-linux-generic-elf-86bit does not exist. Qt Creator has code to automatically detect toolchains, so it's not necessary for every toolchain to be explicitly registered. Task-number: QTBUG-37875 Change-Id: I1e8909da2ff919a8cccdf86bb3a2f7a5cc79a257 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * iossim: fix switch to iPad Retina for XCode 5.1Fawzi Mohamed2014-03-311-1/+1
| | | | | | | | | | Change-Id: Ief267e7fda5c8329cb77ab6104d4ec71a409f979 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | Merge remote-tracking branch 'origin/3.1'Oswald Buddenhagen2014-03-276-245/+718
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
| * Merge remote-tracking branch 'origin/3.0' into 3.1Eike Ziller2014-03-263-3/+18
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/tools/3rdparty/iossim/iphonesimulator.mm src/tools/3rdparty/iossim/main.mm Change-Id: I574d49a7af24fe3f861a5ab182e2b5999f8f2908
| | * ios: simulator support for Xcode 5.13.0Fawzi Mohamed2014-03-2522-179/+1416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update iossim to be based on version 1.9.0, so that we can support the new Xcode 5.1. Keep the old version around and use it with older Xcode. All the logic has been moved into iossim which does an exec of the older binary if needed (so that creator itself remains untouched) Task-number: QTCREATORBUG-11714 Change-Id: I4ad9f922f22367c8371b3be68eae5b6dfdf4df5c Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
| * | iostool: Fix compilation with C++<11Orgad Shaneh2014-03-253-4/+9
| | | | | | | | | | | | | | | Change-Id: Id026a5f0223dff84568a2c2f3208a3e6eb5410fa Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
| * | iostool: support for qml debug and remote port forwardingFawzi Mohamed2014-03-243-236/+688
| | | | | | | | | | | | | | | Change-Id: Id45cc17df1cb941ad0e09ecb6d7936dacac24755 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
| * | iossim: flush stdout (fix regression)Fawzi Mohamed2014-03-201-0/+1
| | | | | | | | | | | | | | | Change-Id: I3deb9ca4c015a1fc15c73a727c8f1ab78638ca7d Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
| * | iossim: remove Objective-C 2.0 literalsFawzi Mohamed2014-03-191-6/+6
| | | | | | | | | | | | | | | | | | | | | gcc does not support them Change-Id: I86726429f299b4e8ac545c4db7cef81c4f091851 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | | Merge remote-tracking branch 'origin/3.1'Oswald Buddenhagen2014-03-1829-182/+1406
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: qbs/imports/QtcTool.qbs src/plugins/git/giteditor.cpp src/plugins/qmldesigner/qmldesignerplugin.cpp Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
| * | iossim: Fix qbs build.Christian Kandeler2014-03-181-1/+1
| | | | | | | | | | | | | | | Change-Id: Iffd135703112b7cc5e86865e0035bab35cf5523d Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
View Lorry Controller Status