aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Debugger: Abort gdb session if no python support is foundv3.1.0-rc1hjk2014-04-021-0/+7
| | | | | | | | | | The message will be untranslated due to the string freeze, but better than nothing. Task-number: QTCREATORBUG-11505 Change-Id: I6f5e65615e4c20f42ce6800b8107f923c2ae2c4f Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* profileevaluator: do not add sysroot if the result does not existFawzi Mohamed2014-04-021-1/+2
| | | | | | | | Required for Qt paths in includes on ios. Task-number: QTCREATORBUG-11908 Change-Id: Ic56c81812d13e3d6f6acb31d59c1ff7c7048aeff Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* ios: override spec for iosFawzi Mohamed2014-04-021-0/+14
| | | | | | | | | | | | | | | | | | | | | On ios qmake is called recursively and the second call with a different spec (macx-xcode instead of macx-ios-clang) which contains the correct build settings (includes, compiler flags) as ios builds with xcode. macx-ios-clang just creates supporting makefiles, and to avoid being slow does not evaluate everything, and contains misleading information (that is never used), whereas macx-xcode correctly evaluates the the variables and generates the xcodeproject that is actually used to build the application. It is important to override only for the creator evaluator, and not the qmake buildstep used to build the app (as we use the makefiles). Task-number: QTCREATORBUG-11908 Change-Id: I06d569de16f934fca5e104a8da727a3557a4c2e3 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* FakeVim: Check handler pointer before using ithjk2014-04-021-0/+1
| | | | | | | | Shouldn't happen in that case. But better safe than sorry. Change-Id: I8461fec32c23e7efe6c949724cf522b58b703acc Reviewed-by: Lukas Holecek <hluk@email.cz> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Use mapping file for app deployment on Windows PhoneOliver Wolff2014-04-022-0/+147
| | | | | | Change-Id: I4c61e1b19c89277829148d31f8ff2b971375d93e Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* More changelogEike Ziller2014-04-021-1/+13
| | | | | Change-Id: I7088ac84ae840c9e1dc83ff667938447406cc607 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Welcome: Store examples search text in settingsAlessandro Portale2014-04-023-1/+19
| | | | | | | | | in QtCreator.ini under "WelcomePage/ExamplesSearchString". The installer pre-set that setting, and in that way pre- select a set of examples. Change-Id: I8ac5a38ad0bd3f33875ef1997ccbf0352410dcc3 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Squish: Configure old Qt Quick projects with Qt 4Robert Loehning2014-04-024-8/+4
| | | | | Change-Id: I3a891ba8a3ca5d437c114a95fb1620a200261301 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* ios: fix refactoring (adding to qrc) in the common caseFawzi Mohamed2014-04-021-0/+13
| | | | | | Task-number:QTCREATORBUG-11548 Change-Id: I6224b8745bf87981f5b305328294437cc51a7e7f Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* QmlDesigner: Build fix with namespaced Qthjk2014-04-021-0/+2
| | | | | | Change-Id: I8ad13d9cb219f27e03d5c30bf1020ba3197ec8c6 Reviewed-by: Marco Bubke <marco.bubke@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Debugger: Move putPlainChildren() to Dumper basehjk2014-04-024-26/+11
| | | | | | | It's reusable... Change-Id: I1a0f40b9b3bbecf99024d3a2fd5148baf604109b Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Debugger: Use target not host architecture in QDateTime dumperhjk2014-04-024-7/+14
| | | | | | | Task-number: QTCREATORBUG-11164 Change-Id: I83bd56f91c1e5342e1a755638c794dde7f5b345a Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* iosrunconfiguration: always update dev type switcherFawzi Mohamed2014-04-011-8/+8
| | | | | Change-Id: I9c9956f20b33274f193fc69639ed7461ba96ff9f Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* FakeVim: Show command output in new editor instead of dialoghluk2014-04-011-4/+6
| | | | | | | | Task-number: QTCREATORBUG-11598 Change-Id: Ifff5a7ffbece93d21a0e688f4f3085d87d9373da Reviewed-by: Lukas Holecek <hluk@email.cz> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Fix crash if no qt version is registeredKai Koehne2014-04-011-0/+3
| | | | | Change-Id: Ib3b4b2379999061b04923b98044ed83743cd6423 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Debugger: Use tested offsets in QDateTime dumperhjk2014-04-011-11/+19
| | | | | | Task-number: QTCREATORBUG-11164 Change-Id: I9184e2f14baa3d3d649839f25088dbd0a01a3496 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* CodeAssist: Display rich text tool tipsNikolai Kosjar2014-04-011-2/+1
| | | | | | | | | | | Regression introduced by commit 2d70c2e2123c73ad8235ec1f06fd785f731dfdc7 Task-number: QTCREATORBUG-11854 Change-Id: I20f5b686b249059ea01e17d9ef4d61c52155b98c Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* AndroidExtraLibsModel: Use QDir::cleanPaths() for entriesDaniel Teske2014-04-011-1/+1
| | | | | Change-Id: Ie429b3e04d933663e9f6a883048ab75851ca63cd Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Android: Prepend $$PWD to paths to ANDROID_EXTRA_LIBSDaniel Teske2014-04-011-2/+2
| | | | | | | Task-number: QTCREATORBUG-11868 Change-Id: I3d3e559d7d5d58efb5b28bc29b71fa812cee277c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* CMakeProjectManager: Ensure that toolchain paths are lastDaniel Teske2014-04-011-5/+5
| | | | | | Task-number: QTCREATORBUG-3959 Change-Id: I93a19af8309933a51d26f94980088c0f244cc84f Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Android: Set ANDROID_EXTRA_LIBS scoped to the archDaniel Teske2014-04-018-14/+64
| | | | | | | | | The workflow for adding a library for multiple archs is not ideal, but now a little better. The user has to go to the deploy setting for a kit per architecture and add the right extra library. Change-Id: I2bda6961f6f1164bdc58acd78fa3d2221977f0cf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Debugger: Switch off external python in tests properlyhjk2014-04-011-1/+1
| | | | | Change-Id: Ic28cff5962b03e0a30c9c67526027b3e2799e738 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Update qbs submodule to HEAD of 1.2 branch.Christian Kandeler2014-04-011-0/+0
| | | | | Change-Id: I5cd40bd819c799838cde82a60037bbe3762e166d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Debugger: Fix new QDateTime offset test on Windowshjk2014-04-011-0/+24
| | | | | Change-Id: I12b31a41e55855ae99989e350075871a2dad4ef6 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* WinRt: detect devices when all prerequisites are loadedJoerg Bornemann2014-04-013-15/+32
| | | | | | | Task-number: QTCREATORBUG-11928 Change-Id: I86ae446e01e3c1c7fe53df886428437f3eda7c18 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Doc: Delete obsolete doc examplesLeena Miettinen2014-04-0146-4092/+0
| | | | | | | | The tutorials that were based on the Addressbook and Battery Status examples have been removed from the manual. Change-Id: I3eb55e40d652205d66ebe9e901736d1971809186 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Doc: Remove obsolete imagesLeena Miettinen2014-04-0190-0/+0
| | | | | Change-Id: I4d026e4b6d7ce73f3e10860cc29e7c4090a5287f Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Doc: update the Android tutorial to also cover iOSLeena Miettinen2014-04-016-65/+125
| | | | | | | | | | Rename as "Creating a Mobile Application". Add the steps necessary for deploying to iOS devices. Fix the link in the Tutorials tab in the Welcome mode. Change-Id: Ie72bf087c789d8d1299b9b5ac19ad732da534012 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Version bumpEike Ziller2014-04-012-4/+4
| | | | Change-Id: I796d981e9b19a54d9ef9ef735d0f72d9ad0b1d34
* Debugger: More robust metaobject extractionhjk2014-04-011-2/+10
| | | | | Change-Id: I359cbdcfb0594b988e041c06efa44c6fd85a8d65 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* QmlDesigner: Fix missing puppet error dialogMarco Bubke2014-04-016-42/+287
| | | | | | Task-number: QTCREATORBUG-11786 Change-Id: Idabd190f3bd8f02ebcc24e4f6be27ca8784d283f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Squish: Explicitly set wanted kitChristian Stenger2014-04-011-1/+5
| | | | | Change-Id: I287ce12a040a81a6392f39385c5a0c26d53b8e28 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* 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>
* QmlDesigner: Hide ToolButtons instead of deleting themMarco Bubke2014-04-011-6/+6
| | | | | | Task-number: QTCREATORBUG-11900 Change-Id: I009e620a19a1747ea7a1c3580c63e0a56b05564e Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* CppTools: Replace Method with FunctionOrgad Shaneh2014-03-316-8/+8
| | | | | Change-Id: I6405c4dfa07eba1ea09ba23fe20667769eaca748 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* German translations for 3.1Friedemann Kleint2014-03-311-2863/+3741
| | | | | | Change-Id: I4ce52075140220c70ef3d25df1321454a01a0c0f Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Ios: Fix qbs build.Christian Kandeler2014-03-311-2/+2
| | | | | Change-Id: I337af64834388ef643108d8502be0abcf53cd9c6 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* ios: make simulator device selection more robust vs corrupted settingsFawzi Mohamed2014-03-311-0/+4
| | | | | Change-Id: I09657cbfb50a8dfeeb4122c920b24926684a1680 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Update debugger language aspect in run settings when qmake step changesKai Koehne2014-03-312-4/+37
| | | | | | | | | | | | | | | | When QML language debugging hasn't been set to a fixed state yet by the user try to find a qmake step to decide whether to enable QML debugging by default or not. This is a hack, breaking the separation between qt build steps and debugger run settings. However, adding a generic project infrastructure for this specific use case is probably overkill... Task-number: QTCREATORBUG-11474 Change-Id: Ib65c8474b9b7ec187769c209531ff56bc8293cde Reviewed-by: Aurindam Jana <aurindam.jana@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Enable QML debugging only if project includes a qml libraryKai Koehne2014-03-311-0/+5
| | | | | | | | | | | | Use the same check as in the DebuggerRunConfigurationAspect to decide whether to enable qml debugging, or not. This allows us to follow the qmakestep setting in the run settings in a follow-up change. Task-number: QTCREATORBUG-11474 Change-Id: I67900cf719a56c0246e792c6aca66ce8e5d77daf Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* QMakeProject: Ensure that toolchain paths are lastDaniel Teske2014-03-311-6/+6
| | | | | | Task-number: QTCREATORBUG-3959 Change-Id: Icba8cabe573557356aa634bb162367ce5b8bd582 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* ios: add qml profiler supportFawzi Mohamed2014-03-316-4/+267
| | | | | Change-Id: I6dbea675a77ed0d151dc6bbdcfa501c00107998c Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* ios: fix update of executable path in the UIFawzi Mohamed2014-03-312-2/+6
| | | | | | | We now update after the profile has parsed, not when it is changed. Change-Id: I70bf9bed85c77677d0ece0d7b99dff590a9e4d47 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* 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>
* Doc: Update creator-deployment-bb10.qdocEl Mehdi Fekari2014-03-312-2/+9
| | | | | | Change-Id: I96ca087e3174d9631a24cd6f752547c75c0dc024 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: David Kaspar <dkaspar@blackberry.com>
* ios: make device simulated configurable in runconfigurationFawzi Mohamed2014-03-3110-47/+137
| | | | | Change-Id: I54bcbd7f2142ab95618005f1f108a122bfe18d32 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Doc: Update first plugin example.Eike Ziller2014-03-315-29/+44
| | | | | Change-Id: I90405eaba68efa0f6861a54a7283dc062a3d1408 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* QtVersionManager: Only load Qt versions after the toolchains are availableTobias Hunger2014-03-313-4/+16
| | | | | | | | | | | | | | | | | The mingw Qt versions need to know the mingw toolchains to run qmake since that may link to a library provided by mingw. This patch delays loading of the Qt versions till after the Tool Chains are available by explicitly listening to the toolChainsLoaded signal of the Toolchain Manager. I do not see how else we can enforce the proper ordering with the plugin initialization scheme we have. Task-number: QTCREATORBUG-11898 Change-Id: I5a93c2b2b32c658695017295652242a5aaa6ee60 Reviewed-by: Daniel Teske <daniel.teske@digia.com> 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>
* ios: cleanup unused simulator stuffFawzi Mohamed2014-03-313-37/+6
| | | | | Change-Id: Id0e877a88bf4bafb44c4be655838253210bcefb3 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>