aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Android: Use mingw32-make if ma-make is not foundDaniel Teske2013-05-211-3/+11
| | | | | | | | Task-number: QTCREATORBUG-9297 Change-Id: I06345bd53fe5672ce7606745e6b19f89379a18db Reviewed-by: Ray Donnelly <mingw.android@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Android: Extra search directory to find make on windowsDaniel Teske2013-05-213-1/+21
| | | | | | | | | | | | | | | | | | | The sdk should set that extra directory, via the sdktool. E. g. something like sdktool addKeys android MakeExtraSearchDirectory QString:%DIRECTORY% where %DIRECTORY% is the bin directory of the bundled mingw. That is Tools\MinGW\bin for the qt sdk. Also see: Task-number: QTCREATORBUG-9297 Change-Id: I487c67b7fb704dd00cf5c6f4f647c8c4fbe8cd3d Reviewed-by: Ray Donnelly <mingw.android@gmail.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* sdktool: Add operations: Fix adding to a empty map, check the right mapDaniel Teske2013-05-175-5/+5
| | | | | Change-Id: Iddcf85d3a19bed28baa9bd4c5f964c370f8c9c42 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Deploy also platforminputcontext pluginsKai Koehne2013-05-161-1/+1
| | | | | | | | | This is required at least with Qt 5.1 / Linux. Task-number: QTCREATORBUG-8471 Change-Id: I7342193ef40fcc1a3e523d787c7521d6e810cd61 Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Remove managed subdirectories in assets when deploying to AndroidEskil Abrahamsen Blomfeldt2013-05-161-1/+3
| | | | | | | | | | | | | | | | | We need to make sure there aren't left-over subdirectories in the assets/ folder when you have used the bundling mechanism for deployment. To make this easier, we fix a bug where a missing slash would cause multiple libraryPrefix() directories with different suffixes under assets/ instead of just a single one containing everything managed by creator. When the slash is added we can simply remove the whole "assets/" + libraryPrefix() directory recursively. Task-number: QTCREATORBUG-9294 Change-Id: Ie24b55680d247df458bc70bbc15abdce51605627 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Make it possible for a module to specify bundling single filesEskil Abrahamsen Blomfeldt2013-05-161-11/+28
| | | | | | | | | | To make sure libQt5QuickParticles.so is loaded for Qt Quick applications, we need to be able to specify bundling specific files, not just subdirectories. Task-number: QTCREATORBUG-9299 Change-Id: I743ee5ea714355ba6398378f4f54b6ede64d4c85 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Squish: Correct shebang locationsChristian Stenger2013-05-163-6/+2
| | | | | | Change-Id: I5af2abaff10dc4095d6cf35350068ca08742b6ab Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Squish: Added copyright headersRobert Loehning2013-05-1570-0/+2030
| | | | | Change-Id: Icdf2f31f73e8b6eed75954ad31d12d48e00109b5 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Prepare re-usage of batch editing...Christian Stenger2013-05-152-11/+17
| | | | | | | ...of the environment variables for the next run. Change-Id: Iaf383dfa361971c75be0e180d72ab95c5df83ebe Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* make phony_target hack work on mac even with qt 5.1Oswald Buddenhagen2013-05-143-3/+3
| | | | | | Change-Id: I4198b090840d287c0f8f1655447cdfaa98992c17 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Bump versionKai Koehne2013-05-142-2/+2
| | | | | Change-Id: Ia0714b038bc1655bb3b5b44a98f9fd6093bcdf79 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* QmlDesigner.ItemLibrary: Allow non qrc source filesThomas Hartmann2013-05-142-2/+14
| | | | | | | | Source files can also be local files relative to the .metainfo file. Change-Id: I8b5519a1bf42808a1bfa744b7520fc910eb2aeac Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Bundle libgnustl_shared.so directly from Android NDKEskil Abrahamsen Blomfeldt2013-05-131-1/+17
| | | | | | | | | | | | We need the logic from 78aa64e06b60bac232fddf87dea3509d1e08c1c0 in the bundle deployment as well. This will ignore libgnustl_shared.so if the Qt installation contains it (for compatibility mostly) and it will copy it from the NDK into the bundle. Task-number: QTCREATORBUG-9291 Change-Id: I5ab59602a3dc64d728a58dd1ee70153c09deac72 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* QNX: Add support for listing processes for pure QNX devicesTobias Nätterlund2013-05-132-1/+56
| | | | | | | Change-Id: Id2d9bd6b7f5ce56ff0d7ece30bb93a69969beecf Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Doc: Qt Quick Controls in Qt CreatorLeena Miettinen2013-05-107-15/+42
| | | | | | | | | Describe the Qt Quick 2 UI with Controls wizard and using controls in Qt Creator. Change-Id: I95ba128c8dde7e0e117f649f2ff974f2c6ee624c Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* CMakeOpenProjectWizard: Explicitly add a "cancel" button.v2.7.1Daniel Teske2013-05-081-0/+1
| | | | | | Task-number: QTCREATORBUG-9264 Change-Id: I7c726177ff855da41d1971245655e8dc24740430 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Inform Qt 5 about the .qmake.cache that we're generatingTor Arne Vestbø2013-05-081-0/+2
| | | | | Change-Id: I2708b8382125302c07f4cce7ef8dcb8af989c78e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix Breakpoint storing in sessionDaniel Teske2013-05-073-10/+1
| | | | | | | Task-number: QTCREATORBUG-9253 Change-Id: Idf517286394796e516115009789e6ff7df527c91 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Squish: Corrected verifyBuildAndRun()Robert Loehning2013-05-071-1/+1
| | | | | | | ...to deal with the behavior described in QTCREATORBUG-9212 Change-Id: Ic69098be5a09fe6aa85c40218483c2d679584ab3 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* QmlDebugging: Attach to QML applicationAurindam Jana2013-05-071-0/+3
| | | | | | | Specify project source directory and sysroot. Change-Id: Ie9287ef4da023159b131e67de51ffc218c4d2a70 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QmlProject: Update code model when target changesKai Koehne2013-05-072-0/+10
| | | | | Change-Id: Ia8008748fb4d35507729c6ae684913e8bf72c985 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Fix crash for long properties in outline modelKai Koehne2013-05-071-2/+5
| | | | | | | | Make sure the outline model only shows the first line of a long property value. Change-Id: Iac8059e927b10c400afec285a6dc6485cbbf49b4 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Doc: edit text about deploying to AndroidLeena Miettinen2013-05-065-29/+127
| | | | | | | | | | | | The default options for Qt 4 and Qt 5 are different. Add background information about Android packages and move information about specifying package settings from the run settings topic to here. Change-Id: I8ee0fac124e19233e85d17e1e37f060183149675 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* QmlDesigner: Fix recursive dirty testMarco Bubke2013-05-061-3/+6
| | | | | Change-Id: I62cb968eb21bb8399cd1918d68e405c9abe5d6e0 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Wizards: QtQuick 2.1 import for ControlsThomas Hartmann2013-05-061-1/+1
| | | | | | | | | | | Since Controls depend on Qt 5.1 we can use a QtQuick 2.1 import. Task-number: QTBUG-31011 Change-Id: I7524c54c3b77ccce89cc57292825f02e163fd7aa Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* QmlDesigner.PropertyEditor: also support .svg for ImageThomas Hartmann2013-05-062-2/+2
| | | | | Change-Id: If43e4661881f99d6a6f692981f19a61ac2c0e500 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* FakeVim: Focus current editor before handling command line commandhluk2013-05-061-0/+5
| | | | | | | | | | Action like "Switch Header/Source" need to be performed in correct context, in this case "CppEditor.C++Editor". But while command line is focused the context is global. Task-number: QTCREATORBUG-9217 Change-Id: I8680e7d9612e72d23e1ef6515904941505f410d8 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QmlDesigner.ItemLibrary: load QML source on startupThomas Hartmann2013-05-063-1/+14
| | | | | | | | The QML source is now loaded while dragging, which creates hickups. Change-Id: If43e4661881f94d6a6f692981f19a61ac2c0e508 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner.qml2puppet: Adding simple testThomas Hartmann2013-05-061-0/+22
| | | | | | | | | This test will fail and give an error message, if inbuild item are missing. Change-Id: Ib7a33e7d1fbd22f76c8ac31e1dbc68912aa8edaa Reviewed-by: Marco Bubke <marco.bubke@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Squish: Stabilize invoking context menu items on MacChristian Stenger2013-05-061-0/+2
| | | | | Change-Id: I64ed356b6120c38d51c646ae409bbbc3a4fe9e8e Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Squish: Added timeout for waitFor()Christian Stenger2013-05-061-2/+2
| | | | | Change-Id: I9d15d03c9b289f41830a57ed659264a324338cc6 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Squish: Use readFile() if possibleChristian Stenger2013-05-062-11/+2
| | | | | Change-Id: Ia850e624f24dd57589d7276af22aef1498c3c799 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Doc: edit Android dev instructions for Qt 5.1Leena Miettinen2013-05-062-10/+77
| | | | | | | | | Separate the instructions for configuring Qt Creator for Necessitas and Qt 5.1 to make the process clearer. Add missing information. Change-Id: Iac8fb1d9bcdec57783905fae2e9fea1b222d28bb Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* QNX: Fix shutdown of inferior and inserting breakpoints on WindowsTobias Nätterlund2013-05-067-10/+71
| | | | | | | | | | | | | | | | | When debugging on a QNX device on Windows, neither DebugBreakProcess(..) nor "-exec-interrupt" works for interrupting the inferior process. Neither does sending it a SIGINT signal using "kill" on the device. This changes the local gdb process to run under the CtrlC stub on Windows when debugging on QNX. This enables us to send a Ctrl+C message to gdb, which interrupts the inferior, and allows us to insert breakpoints during runtime on Windows. Change-Id: I4b01fbe81138f3fe7a939a7e64267bac4eb8bf43 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Fix deployqt for qt4Eike Ziller2013-05-031-5/+6
| | | | | | | Don't try to deploy qt quick 2 imports if they aren't there. Change-Id: I1146ad8a81973af9e80c82caad515fea45b1530e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Deploy qtquick2 imports for qml2puppet.Eike Ziller2013-05-031-5/+15
| | | | | | | | Task-number: QTCREATORBUG-9235 Change-Id: I9fae92bd9c1a07066d7d312008a7e10613b414f7 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Enable mechanism to bundle Qt in APKEskil Abrahamsen Blomfeldt2013-05-036-41/+331
| | | | | | | | | | | | | | | If the Qt version built against is Qt 5, and the deployment method is "Use libs on device" + "Use local Qt libs", Creator will copy the required files into the app bundle and set the necessary meta-data to make the Java code in the app actually load them from the app bundle. We also make this deployment method the default on Qt 5. Change-Id: Ib7a33e7d1fbd22f76c85c31e1dbc68912a38eda8 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* C++: Fix crash in code completion.Erik Verbruggen2013-05-037-49/+33
| | | | | | | | | | Caused by a dangling pointer of a template instantiation which had been cloned into the wrong control. The fix is to remove that control and refer to the control of the bindings (which is the correct one). Change-Id: I951a60f2e613aae1e4ac901ce99c820212018709 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Remove StatusDisplay.qml from qbs build systemTobias Hunger2013-05-031-1/+0
| | | | | | | It is already gone from qmake. Change-Id: Iad2835d6b937fc7215da070a1c839139419026dd Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Git: Use consistent ordering for Merge Tool dialogOrgad Shaneh2013-05-021-4/+5
| | | | | | | | | | On Windows it is "Ignore, Merge Tool, Skip, Abort", while on Linux it is "Merge Tool, Ignore, Skip, Abort" That makes Ignore default on Windows, which is confusing Change-Id: Id7e9e8dd6fd5748d518de4d94db47ae075268627 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Wizards: Adding simple wizard for QtQuick.ControlsThomas Hartmann2013-05-023-0/+52
| | | | | | Change-Id: I80746a3e77f94040a407ce25cec9ad6fac8b6fce Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* UicCodeModelSupport: Make the code not so eager to run uic processesDaniel Teske2013-05-025-15/+47
| | | | | | | | | Instead mostly postpone it until the contents are needed. Task-number: QTCREATORBUG-9149 Change-Id: I83167537e97fbd965531d990c8073409ff7b0b32 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* WelcomePage: Show demos in the examples viewThomas Hartmann2013-05-021-1/+1
| | | | | Change-Id: Idc466b7e058375c0e393eb9f9dd2cc8f58abb2af Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Ignore dirty working directory for qbs submoduleOrgad Shaneh2013-05-021-0/+1
| | | | | | | | | | | The submodule is mostly used for building against, not for editing. On most cases, its internal status is not interesting, and git scans it for no reason. Change-Id: Ic290bd78fdb6704a15264a022125c99cf006a0db Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Squish: Using progressBarWait() instead of waitForSignal()Robert Loehning2013-05-0211-20/+16
| | | | | Change-Id: Ia87569c080f3b54dd8f78b023408de76eb3c574c Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Fix crashOrgad Shaneh2013-05-012-11/+0
| | | | | | Task-number: QTCREATORBUG-9230 Change-Id: I24a6277c9ca5f35c803e276da82ca2b9e9d79f57 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* Make sure QtQuick2 plugin is installed into right directoryKai Koehne2013-04-301-1/+1
| | | | | | | | Task-number: QTCREATORBUG-9229 Change-Id: I0ec3fef8cdc795f041c7ec39c1fd6b68a138046f Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Michael Brasser <michael.brasser@live.com>
* WelcomPage: fix video descriptionThomas Hartmann2013-04-301-4/+0
| | | | | | | | Task-number: QTCREATORBUG-9087 Change-Id: I80866ace00f940000407cc25cecaad6fac8b6eee Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.PropertyEditor: allow translation of all stringsThomas Hartmann2013-04-301-0/+1
| | | | | | | | | | This patches adds the tr checkboxes to all string in the generated property sheets. Task-number: QTCREATORBUG-9184 Change-Id: I4a3ff8120d7ccd5a6b9e11d212f955cd66ba01aa Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner.SubComponentManager: We have to use importPathsThomas Hartmann2013-04-301-10/+2
| | | | | | | Otherwise we skip items derived from types only available via imports. Change-Id: I102a4843652029dff777e12594efc4d5e5e50999 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 15:52:23 +0000