aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ios: don't delete autodetected desktop kitsv3.0.0Fawzi Mohamed2013-12-101-2/+1
| | | | | | Change-Id: Id4ce4499bb216947cf88f2f514d17b03f717eba6 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Changelog: Update VCS changesOrgad Shaneh2013-12-091-0/+12
| | | | | | | Mostly Git Change-Id: Id4471cfd26ca7832aa081fb29495d4e6f020f7b8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Qnx: Fixing incorrect environment for running BlackBerry cmd-line toolsDavid Kaspar2013-12-093-0/+10
| | | | | | | | | | | | | | | The BlackBerry command-line tools were launched without any environment set that would match the related BB NDK Target. This results in command-line tools to not run at all (they fail to find 'java' program). The only workaround it to have 'java' program on system PATH. Task-number: QTCREATORBUG-11029 Change-Id: I90e102413d7843d538d394aec306749e37e6148b Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: David Kaspar <dkaspar@blackberry.com>
* Fix compilation of ios plugin with Windows 64 bitKai Koehne2013-12-091-0/+2
| | | | | | | | | Q_PID is a pointer under windows, and the compiler won't allow us to convert a 64 bit pointer to int. Task-number: QTCREATORBUG-11026 Change-Id: I34e45bf2ef1e565c5967fac6b482c14117a04578 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Remove unneeded texts.Jarek Kobus2013-12-091-4/+2
| | | | | | Change-Id: Ibf18eb165b9e052c9a77b1b917b2746d56f81646 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QmlProjectManager: Fix spellingThomas Hartmann2013-12-081-1/+1
| | | | | Change-Id: Ia03bb14c7e19090fa71ebf35597539a254bcb308 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Remove function acceptIndented that is not used anywhereThiago Macieira2013-12-061-5/+0
| | | | | | | | | | | Found by ICC: warning #177: function "<unnamed>::Rewriter::acceptIndented" was declared but never referenced Change-Id: I37892d021a4ca9886fd35fea00102d44fa99320f Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* qbs: fix ios profilesFawzi Mohamed2013-12-061-3/+13
| | | | | | | | Task-number: QBS-427 Change-Id: I2ad69076ba8fe4c989f6909b77087c94def683cb Reviewed-by: Ivan Komissarov <ABBAPOH@me.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Fix warning about non-void function with no returnThiago Macieira2013-12-061-0/+1
| | | | | | | | | | | remotelinuxruncontrolfactory.cpp(124): warning #1011: missing return statement at end of non-void function "RemoteLinux::Internal::RemoteLinuxRunControlFactory::create" Technically, the function doesn't reach there, but ICC 14 doesn't know about it. Change-Id: Id55f6f33ff7c0eb97dba9af99bf0d34a9c01e191 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Qnx: Update target list after Environment Setup WizardEl Mehdi Fekari2013-12-055-0/+8
| | | | | | | | | | Task-number: QTCREATORBUG-10795 Change-Id: Ia158370a00762190fa4b209e27c52c2ef32e5819 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Resolve links and normalize file names when opening editors again.Eike Ziller2013-12-051-1/+3
| | | | | | | | | | | | | For the check if a certain editor is already open. Broke with 8c2e3fd2cbaeb1178ae3991de794ee6d74c84d85. Task-number: QTCREATORBUG-10836 Task-number: QTCREATORBUG-10945 Task-number: QTCREATORBUG-10994 Change-Id: Id1b20cd935986306f85a659f19dff52f2ee38052 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Debugger: Do not test the hash seed value in dumper test.David Schulz2013-12-051-1/+1
| | | | | | | On Windows the hash seed is initialized before the main is entered. Change-Id: If7d2fd6ac1d15e704a6fc984c2d3218a5facdd5c Reviewed-by: hjk <hjk121@nokiamail.com>
* CppEditor: Visual hint for changed preprocessor directives.David Schulz2013-12-052-4/+14
| | | | | Change-Id: I3c3ae623beab55259179aaf0613d2bc5aaad1c28 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Fix build failureJan Kundrát2013-12-051-1/+1
| | | | | | | | | | QStringList::join doesn't accept a QLatin1Char on my system. This fixes a build regression introduced in commit fccffba04bbac0439583272b1c73151e9a00b0c6. Change-Id: I98d8339032cb5ea315e09860aac3db91ab21d4c5 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QNX: Use correct command for running the SDK installerTobias Nätterlund2013-12-051-2/+6
| | | | | | | | | | | | | | Depending on NDK version, the application used for the SDK installer is different. Without this, the installation of NDK's is not possible from within Qt Creator. Change-Id: I71ba67ccb05d30bcef5b63e7e397e545c5a89e3e Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: David Kaspar <dkaspar@blackberry.com> Reviewed-by: Mehdi Fekari <mfekari@blackberry.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Update french translationGuillaume Belz2013-12-041-3458/+8106
| | | | | | | | Also, converted non-breakable spaces into &nbsp;. Change-Id: I3cf7f3b1bc3a5bd90219ea5ffa794411d5c8bc85 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Android: Fix restoring of MakeExtraSearchDirectoryDaniel Teske2013-12-041-6/+4
| | | | | | Task-number: QTCREATORBUG-10983 Change-Id: I73dbc3e5279db8d85954d15411b68c47a038bafb Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Polish Polish translationsJarek Kobus2013-12-041-17/+34
| | | | | | Change-Id: I55ac136b63e389f5c433a401067dd2ea477632d3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* ios: cleaner kill of subprocess of iostoolhandlerFawzi Mohamed2013-12-042-2/+23
| | | | | | | | | | try to first terminate (sig TERM) the tool before killing it (this ensures a cleaner shutdown of the connection to the device). Task-number: QTCREATORBUG-10922 Change-Id: Ib39fbd1d35a651cdb51364532bdef5b69cb1347e Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* ios: fixing DYLD_FALLBACK_FRAMEWORK_PATHFawzi Mohamed2013-12-041-5/+8
| | | | | | | adding /System/Library/Frameworks for completeness Change-Id: If2fbe015af591eb3ff820b2ea2f732b2d4c08e01 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* ios: wait 5s after sucessful deployFawzi Mohamed2013-12-041-0/+2
| | | | | | | | | Ios 7.0.4 with xcode 5.0.2 seem to need a bit of time after installation before running, otherwise the device might be locked up. Task-number:QTCREATORBUG-10922s Change-Id: I4d35d0c3b21407db7d0aa5f629d3fa51117d4ddd Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Debugger: Reset engine type and ABI for non-existing commandsTobias Hunger2013-12-041-0/+3
| | | | | Change-Id: I53bdb26ea4e48d59b4623076da9cdb4ff499c3e1 Reviewed-by: hjk <hjk121@nokiamail.com>
* Debugger: Do not lose the engine type in the debuggeritemmodelTobias Hunger2013-12-042-0/+6
| | | | | | | | | Have the DebuggerItemConfigWidget remember the engine type (even though it does not display it), so that it can write that information back into the model later. Change-Id: I1ed0d6a8d3750696a7eb5c453179acc282b78ce4 Reviewed-by: hjk <hjk121@nokiamail.com>
* Debugger: Do not warn SOFT_ASSERT when no debugger is selectedTobias Hunger2013-12-041-1/+3
| | | | | | | | Do not not try to update the debugger if none is actually set. This avoids triggering a SOFT_ASSERT in the debuggeritemmodel. Change-Id: I646e251f58d6e25f1a88bddc142d953f94522084 Reviewed-by: hjk <hjk121@nokiamail.com>
* Fix custom dumper text edit tooltipJarek Kobus2013-12-041-2/+2
| | | | | Change-Id: I8fa68357abfcebfd04839c4552681608b0c6d2e3 Reviewed-by: hjk <hjk121@nokiamail.com>
* Update Russian translationsSergey Belyashov2013-12-041-2/+2
| | | | | | Change-Id: I98caf7eb1f5fa1ea3ba21a296e42e8906e2541ab Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* iostool: avoid deploying when just running, improve app lookupFawzi Mohamed2013-12-042-7/+18
| | | | | | | | -run now only runs improved app path lookup efficiency (lookup only required info) Change-Id: Ic32be229c997548eab4d63e43970d640c25a1abe Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* QbsProjectManager: Support generic Unix targets.Christian Kandeler2013-12-041-0/+11
| | | | | | | | | | | | | | The profiles that we currently create do not work with any non-Linux, non-Mac Unix system. Note: This patch introduces some additional redundancy to keep the risk close to zero. Clean-up can be done later in a non-frozen branch. Task-number: QTCREATORBUG-10968 Change-Id: I4e150d641a726826b8f3bae4b4a25d80c51f08c9 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Tim Sander <tim@krieglstein.org> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Remove improper tooltipsJarek Kobus2013-12-041-6/+0
| | | | | | | | "Debugging" groupBox was probably copied from "Warnings" groupBox, with all its children checkBoxes and their tooltips. Change-Id: I9eee7b70adb035b9bb1a1851a33079f2db5cff73 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QmlProfiler: Update timeline contentWidth also if width changesUlf Hermann2013-12-031-9/+10
| | | | | | | | | | | As the contentWidth depends on both the width of the flickable and the currently selected time range it should be updated if either of them change. Otherwise we can miss changes and show stale data. Change-Id: Iab9e17eef3490531175a2374fb3da0e0071f3bd1 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Limit cdUp to rootOrgad Shaneh2013-12-036-7/+11
| | | | | | | Task-number: QTCREATORBUG-10860 Change-Id: I22550b4415e07cac0d78f36595dc7ee781a837c0 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* C++: Compile fix for cplusplus-mkvisitorNikolai Kosjar2013-12-031-13/+13
| | | | | | Change-Id: I60f6ffe639ae404f8fe25aa6ed6a51733612d837 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* WelcomeScreen: Avoid loading of invalid picturesUlf Hermann2013-12-031-2/+2
| | | | | | | | | | | | Apparently the QML engine also loads pictures for invisible Image objects. The pictures icons for examples and tutorials on the welcome screen thus always try to load an extra video icon, which always fails. By setting the URL to an empty string if the example or tutorial being loaded is no video we can avoid that. Change-Id: Ibafc11ed233f386bbbf1e7a4830fcb34bc1cd55d Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Fix in German translationRobert Loehning2013-12-031-1/+1
| | | | | Change-Id: I8b69fa1dd1a68a8422bac4662dfa60e836cac18b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Update Polish translationsJarek Kobus2013-12-031-1143/+5681
| | | | | | Change-Id: Ib405c0941b47453d1ae492055ceef91f369e2312 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Version bumpEike Ziller2013-12-032-8/+8
| | | | Change-Id: I9bf6bbeefcfce9759f8b10e0d5dfb9864315beb4
* Update qbs submodule.Christian Kandeler2013-12-031-0/+0
| | | | | | | | | This updates qbs to the HEAD of the 1.1 bugfix branch, which has a number of bug fixes on top of what's in the RC. Change-Id: I95e3c8b45befb639c4a016b32cbe88145baae16f Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* FakeVim: Fix infinite loop when replacing empty texthluk2013-12-032-1/+24
| | | | | | Change-Id: Ie4ba6420889b0a6a5712b43a11f8366aa9a30edc Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Squish: Remove unused functionRobert Loehning2013-12-031-4/+0
| | | | | Change-Id: I2860d77dcb6a571e6af0e8aff86b997c12dafc90 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Remove unused objectsRobert Loehning2013-12-031-4/+0
| | | | | Change-Id: I36d5174e26b853777792f69eac4df16efc52292b Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Use generic function textUnderCursor(...)Robert Loehning2013-12-031-9/+6
| | | | | Change-Id: I7ea6e9af1435e716266f4dfd917fe9ac568a67a5 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* install x86 vcredist only if it is necessaryTim Jenssen2013-12-031-1/+8
| | | | | | | Change-Id: I7d3b3aa35ceef3502c6b4250b60a572631a117be Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fix hang at end of installation.Niels Weber2013-12-031-2/+3
| | | | | | | | Task-number: QTIFW-416 Task-number: QTCREATORBUG-10974 Change-Id: Ib2759cda2e24915880e134a13af126572094bd66 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Revert "C++: Fix highlighting for lines with predefined macros"Nikolai Kosjar2013-12-038-88/+15
| | | | | | | | | | | | | | | | | | This takes too much memory. For qtcreator.pro the numbers are as follows: Patch applied: ~ 1600MB (RES) Patch reverted: ~ 510MB (RES) This reverts commit 4c2daa90ce558c3b4287edc97127471486a411d9. Task-number: QTCREATORBUG-10973 Change-Id: I843bd7c1ea4a26a1ec55ddc14c2a34a98d040922 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* WelcomeScreen: Don't use clippingUlf Hermann2013-12-031-3/+2
| | | | | | | | Aparrently clipping is slow in QML, so we use elide and manually control visibility instead. Change-Id: Idb743a8daec04b028f103a075a5416729f0e2a16 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* WelcomeScreen: Scroll the example grid view with the main scroll viewUlf Hermann2013-12-031-3/+5
| | | | | | | | By tying the scroll offsets and visible areas of the two scrollable elements together we avoid excessive loading times for the examples. Change-Id: I6522ef3e6c0454e5bb05bef143953d8d1850ffdc Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlProfiler: Handle enable and show signals for zoomslider in C++Ulf Hermann2013-12-033-5/+17
| | | | | | | | | | | As it's hard to pass arguments for signals from non-QML-mapped objects to QML objects handle the signal in C++ instead and just directly set the properties. Task-number: QTCREATORBUG-10943 Change-Id: I039f6938db3d7e64ca1a4bcff2f0f6aa79c65219 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Remove wrong Qt Creator version number from Qt Quick template filesKai Koehne2013-12-033-3/+3
| | | | | | | Task-number: QTCREATORBUG-10975 Change-Id: I6eb87a789ce88b1f3f298ef65b8bb96ce2348501 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Welcomepage: Is should not be possible to uncheck tabsThomas Hartmann2013-12-021-0/+1
| | | | | | | Unchecking a tab has no clear semantic. Change-Id: I9bb3d659a76655846c79cabbe23717119ed0cf08 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Debugger: Restrict QTimeZone use to Qt >= 5.2hjk2013-12-021-0/+9
| | | | | | Change-Id: Iba786c265ddf7163fd7bb779d103065de3f83547 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 14:12:23 +0000