Commit Graph

31594 Commits

Author SHA1 Message Date
Friedemann Kleint
0c621dcdcf Reduce usage of QStringRef::toString() in debuggertooltipmanager.cpp.
Change-Id: I5236df01aec5a5a173ea81d50330f0255603acad
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-29 11:19:00 +02:00
Friedemann Kleint
09be44a782 Reduce usage of QStringRef::toString() in texttomodelmerger.cpp.
Change-Id: I2c42e714d916696cfa1e16575665ee48a42dccac
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-29 11:17:26 +02:00
hluk
41785890d6 FakeVim: Escape '>' character in mappings
On some keyboards, '>' character can be produced using Shift key. But
recorded macro shouldn't contain '<S->>', which cannot be properly
parsed, instead it will be '<S-<GT>>' (as '<LT>' for '<').

Change-Id: Iac3759029b6ff8c9e690c4728e35048c0b6046f9
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-29 11:10:36 +02:00
Orgad Shaneh
a60cf5d0fa Git: Use default show format for diff viewer
The widget is quite small, no reason to load it with
(normally useless) data

Change-Id: I092233124505f64d05a49d9da6463b64bbb398bb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-08-29 10:57:18 +02:00
jkobus
33a7952745 Implement syntax highlighting in diff editor
All Qt Creator's main highlighters are used in the first place,
for other mimetypes generic highlighter is used as a fallback.

Task-number: QTCREATORBUG-9580

Change-Id: I863b9085520e5bdda142ce88f2074afeacee0531
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-08-29 08:54:04 +02:00
Nikolai Kosjar
a06da47d5b Locator: Allow to filter for path in BaseFileFilter
If the input contains a path separator, the input is matched against the
file path. Otherwise, as before, the input is matched against the file
name.

This affects AllProjectsFilter, CurrentProjectFilter and
DirectoryFilter.

Usage Examples:
    "src/*main.cpp"
    "cppedtior/"

Change-Id: I8bc55642b388a8f8e1d7a949f80bbe1abc41ae3c
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-29 08:27:53 +02:00
hjk
853fcf3c43 Debugger: Auto-test compile fix with Qt 4
Change-Id: I414e829214a6e2e306998230aafde1a75c0af857
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-08-28 16:16:48 +02:00
Friedemann Kleint
e86ef45aaa Fix compilation with Qt 4.
Change-Id: I9217eb6695b9e48579f66b7fd8709c84806ffb66
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-28 16:08:02 +02:00
Daniel Teske
31fe6f069c Android: Use minimum sdk instead of build target sdk to filter devices
Task-number: QTCREATORBUG-9662
Change-Id: I3a5b3493bc8ef48bd23d014e86eef45185f3c17e
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 16:05:44 +02:00
Daniel Teske
307aa7b3aa Rename AndroidManager::targetSDK to buildTargetSDK
There are 3 different sdk settings:
- The minimum sdk setting from the AndroidManifest.xml
- The target sdk setting from the AndroidManifest.xml
- The target sdk setting from the project.properties file

The last one is now called buildTargetSDK, since it only affects the
build.

Change-Id: I373d925a45088ff0cf8a8e0b22cf9744e571eeb1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 16:05:35 +02:00
Marco Bubke
1fee440e72 QmlDesigner: Remove unused AnchorLine
Change-Id: If8b8656f821ef5b5e25a37e020ead7f9c1e15ff9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-28 15:54:17 +02:00
Friedemann Kleint
6e31975313 Use QStringRef in parsing plugin-specs.
Avoid unnecessary string allocations, fix error reporting
which would pass PluginSpec::name instead of element to the
error message.

Task-number: QTCREATORBUG-9002
Change-Id: I0d136ef27f4226e1ba79e74ddab6b63cf0f20c74
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-28 15:25:19 +02:00
Daniel Teske
3c2facab5f Android Manifest Editor: Add support for minimum and target sdk settings
Task-number: QTCREATORBUG-9692

Change-Id: Ide85392d86e7f3df4df9644f01d186ed939f5124
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 15:06:25 +02:00
Daniel Teske
211e56b5b7 Android: Detect "unauthorized" devices.
For now just show that in the compile output.

Change-Id: I332a8cae5653155175abfb1a4877ca1ca7cce8d5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 15:00:45 +02:00
Daniel Teske
de1af231e9 Compile
Change-Id: I39c69bace0926e381b3569818401ddda8dd2c986
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-28 15:00:29 +02:00
Daniel Teske
1c633eb1e9 Android: Connected devices should list all devices
E. g. waitForAvd needs all devices to correctly work.

Change-Id: I1b704e85bd7449d4c45ed36be48973f39148b8c4
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 14:54:56 +02:00
Daniel Teske
9d0ae5beee AndroidQtVersion: Call base class parseMkSpec
Change-Id: I8c9ca6cc61b49e5f5a437b95ac63a90ac0ee7667
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-28 14:45:01 +02:00
Tobias Hunger
6f991d362e QtKitConfigWidget: Do not warn when invalid Qt versions are changed
Change-Id: I7f571f360dbe2306f613d52231826382551fc9d5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-28 14:33:54 +02:00
Kai Koehne
42bf1dba3a Bump version
Change-Id: I7b48adcc38b647a7823899f45b15686832bd4e49
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-08-28 13:28:43 +02:00
Thomas Hartmann
732d5ec701 QmlDesigner.QmlPuppet: fix for clipping in sub items
We did not clip sub items if clipping was enabled.

Task-number: QTCREATORBUG-9604
Change-Id: I75fdabd86193fbfbf397bf3d119a1a33c72cf771
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-28 12:22:11 +02:00
Thomas Hartmann
61e7641a6d QmlDesigner.QmlPuppet: fix for nonInstanceChildIsDirty()
We did not take care of the case where only the transform of a child
changes but nothing else.

Task-number: QTCREATORBUG-9796
Change-Id: Id997e527193c103abf3aeb77826501fb8f701fb7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-28 12:19:22 +02:00
Thomas Hartmann
cb0e37128b QmlDesigner.QmlPuppet: fix for bindings and alias properties
For alias properties a binding to the original property
was not properly enabled.
This means that if bindings were reseted the original value from the binding
was overwriting any change to this property.

Solution: We disable the binding of the alias property manually using the
hash from resetBinding().

Task-number: QTCREATORBUG-9582
Change-Id: I7a891bbdd06154de8a4e1ff2d3c0939d4e8b4010
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-28 12:11:54 +02:00
Tobias Hunger
a7bb77288d BC: Move builddirectory handling into BC itself
Use setBuildDirectory() in the different BuildConfigurations instead
of reimplementing that over and over again.

Change-Id: Ic355fdb4624c71667ce470b3e2865c9a8722ef09
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-28 11:41:38 +02:00
Tobias Hunger
52a41ecb0c Qt4BC: Simplify shadowbuild/builddirectory handling
Change-Id: Id46a239588d21b6aa5d4c43e4d85b52a04bd17ab
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-28 11:39:29 +02:00
Robert Loehning
769788a452 Squish: Remove outdated workaround from tst_codepasting
Change-Id: I62d236ad691c878a324a307d3e9b1ce6c183966a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-08-28 11:03:20 +02:00
Orgad Shaneh
9f2110f8a1 Git: Extend show output on diff editor
Change-Id: I51d3d0af96b28ec56bedaac163f9ce72158d8dc2
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-28 10:12:01 +02:00
Orgad Shaneh
0865e9eb27 Git: List branches on show
Change-Id: Ie69a58efc7068c699abf0e3d396216d9809346f4
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-08-28 09:56:47 +02:00
Christian Stenger
4433f7aadd Squish: Enable running on Qt5
Change-Id: Id74f1f2162542cbac98f86bc0c0b049334cdf035
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-08-28 09:21:34 +02:00
Nikolai Kosjar
51f69c8807 Doc: Locator accepts paths and namespaces
Change-Id: I7f3ba58677c706bd840cfef44abf6db7933b21e8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-27 17:43:01 +02:00
Christian Kandeler
17a06721b3 Update qbs submodule.
Change-Id: Ic771d9c0c912449554e557bb8cff9f05aa7ba88b
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-08-27 15:07:46 +02:00
Mehdi Fekari
01ebbe19ba Qnx: Support multiple BlackBerry target configurations
The new bbndk 10.2 is based on multiple targets (based on multiple bbnk-env scripts).
There is no default/common bbnk-env.sh file anymore, and an NDK directory may contain
various bbndk-env scripts (i.e targets).

This patch makes the BlackBerryConfiguration based on the bbnk-env script path
rather than on the NDK path. This will enable having multiple configurations
per targets in the same NDK directory.

N.B: NDKs 10.1 with one default bbnk-env file are still supported.

Change-Id: Icec57c6e722caec7e5ff81e3a9ce4d2cf11f249a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-08-27 14:22:17 +02:00
Orgad Shaneh
afcb9b2c41 Git: Show active branch next to command in progress
Revised topic is "master (MERGING)" instead of MERGING

This should also fix topic getting stuck as REBASING

Change-Id: I934643f5b4e632318495f141536c666f775bd15d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-27 12:22:43 +02:00
Orgad Shaneh
969f9628db Git: Trim output lines on checkout
Change-Id: I84cb48f77ceae8f12269541a195afd2a652667b1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-27 12:22:22 +02:00
Oswald Buddenhagen
4855871607 Merge remote-tracking branch 'origin/2.8' 2013-08-27 10:48:08 +02:00
hjk
938151a0d7 Debugger: Enable pretty-printing of FORTRAN character*n types
Change-Id: I46602fe6691471427d9f95925e8f88e99ab962f4
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-26 22:41:39 +02:00
David Kaspar
1a2baecf6a Qnx: Fixing crash when launching BB10 application
m_futureInterface field might be 0 when reportProgress slot is called

Task-number: QTCREATORBUG-10038
Change-Id: I93931e78f3a5077bb347b184f5e61230a1955695
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-08-26 18:49:53 +02:00
Christian Kandeler
525a9f6a03 Diff editor autotest: Fix compilation with namespaced Qt.
Change-Id: I2effb0c94c9590e57c5d49ed285640dcd3a95727
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-08-26 18:03:22 +02:00
Christian Kandeler
eecacbfbfe CPlusPlus: Some compile fixes for autotests.
Change-Id: Id2ced5e41686387e67a7bb8419fe1547b23779c7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-08-26 17:45:54 +02:00
Nikolai Kosjar
0dce5de6fd Plugin tests: Specify test functions with wildcards
Example:
    ./qtcreator -test CppTools,"test_cpplocatorfilters_*"

If test data is specified, it will be applied to all matching test
functions.

Change-Id: I579d9aa6ac3d3808ea7e71db3c067d468125569b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-26 17:34:04 +02:00
Tobias Hunger
4da06735dc Python: Do not export symbols
Nothing depends on this plugin, so these exports are not needed.

Change-Id: I7a6c1c6fd1dd355c904d2dcb6d3f0522cf30adcd
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-26 16:26:03 +02:00
Tobias Hunger
6a4e4cfb25 GLSLEditor: Remove needlessly exported symbols
... and move code into Internal namespace.

Change-Id: I02a90c33db0ffe574af43bdb8d8e37b4159f8f0f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-26 16:25:35 +02:00
Friedemann Kleint
a94aba2a97 Fix fields of pastebin.ca - protocol.
The name parameter actually is a description/title.

Task-number: QTCREATORBUG-9996

Change-Id: Id2e50b62ec4bd2f0dd0e5ead94322770e6fa75fc
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-08-26 16:23:07 +02:00
Oswald Buddenhagen
393792956f don't complain about missing include()s during cumulative evaluation
it produces simply too many false positives.

Change-Id: I3dfa109866450babe5c16f84665ad22024d99e42
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qttools/08bae158320f6d73bf44fcf43f45f51a01334544)
2013-08-26 14:37:49 +02:00
Oswald Buddenhagen
2995768776 execute some loops even in cumulative mode
we execute foreach loops now. this is (mostly) safe nowadays, because
a previous change added precautions against exponential value list
growth, so it's unlikely that two nested loops would keep the cpu busy
for a day as before.

we continue to exclude forever loops and loops with excessive integer
counts.

Task-number: QTCREATORBUG-6840
Change-Id: Iaa116086986cc7fd5023834753f791dd205102e5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qttools/dd4d594c787a62fa8aa12695c5d115c71b59bacd)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-08-26 14:36:58 +02:00
Oswald Buddenhagen
fd9ed1b761 don't crash if builddir is suffix of sourcedir (or vice-versa)
Change-Id: I97a6e2ebd51350cbf39c86efa5c26a376c49da95
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/b30273ec4a4ce65794fd402c6e3eb21de7bae1b9)
2013-08-26 14:36:11 +02:00
Oswald Buddenhagen
8b6c53733e make split_value_list() even less sane again
contrary to what one may expect, it's actually *not* supposed to remove
the meta-characters it interprets.

luckily, this function is not used much any more ...

Change-Id: I2b60f9b173140da78db2b07b596cc2e5f6e6d555
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/783181cfc11e995ad678237ebc0025a2a023c88c)
2013-08-26 14:36:03 +02:00
Oswald Buddenhagen
eff4a5dcee change reporting of missing files
use the new parser flags to report all i/o errors directly.

as a notable side effect, the "WARNING" prefix is gone (even though
it is still treated like that, which is mildly insane to start with).

Change-Id: I084375d5e7a3314ae763795f7c318804a9fb84b6
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/b4c0d9166e7a8f5dfa5ca052002a5ab318787aa2)
2013-08-26 14:35:00 +02:00
Oswald Buddenhagen
7a707eb2ce complain about absent files to -pro argument (in lupdate)
sync up; this doesn't actually do anything in creator (or qmake).

Change-Id: I908fc3792bdc321370e51be98adf7a9c81e37a85
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/15981b985fa3ae250af22f68ddb50e08bd9ce421)
2013-08-26 14:34:25 +02:00
Oswald Buddenhagen
41b1684a6d avoid boolean argument trap: introduce QMakeParser::ParseFlag
Change-Id: I26ce032a1aa044e9a4da0c8708a4490b07374992
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/0a1faaa9eb7807bf11d796c2eca624e2f3b378a7)
2013-08-26 14:33:52 +02:00
Oswald Buddenhagen
fd596b7f6a exclude qbs subprojects from lupdate message collection
the qbs translations should come from the qbs lib itself.

requires qt 5.1.2 to have an effect.

Change-Id: I0aabeaf24d06c9070c2de6e5a0bb9a8ddd6c06c1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-08-26 14:33:42 +02:00