Commit Graph

31523 Commits

Author SHA1 Message Date
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
Jake Petroules
be0022d495 Export Qt plugin path to QBS configuration.
Change-Id: I14c4315b6a5029723c2940c05160551361b91dd3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-26 14:16:00 +02:00
Tobias Hunger
00a80839b3 Welcome: Remove unused export macros
Change-Id: I3f894c718f8a940c4d5685a882402ba08ccde75c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-26 14:11:46 +02:00
Nikolai Kosjar
aa1aeeafa1 CppTools: Locator: Match also against qualified names
If the user input contains "::", match against the qualified symbol
name. Otherwise, as before, match against the unqualified symbol name.

This applies to the function and class filters and allows to narrow down
the results by using a namespace prefix, e.g. "c core::*category".

Change-Id: Id152f412740e27f2f2d001dc7008dba8a92a37ce
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-08-26 13:43:07 +02:00
jkobus
e8801167aa Add common interface for text formats inside syntax highlighter
Change-Id: I87f64446161a57aea0896f68e4eafacef791969b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-08-26 13:39:40 +02:00
Nikolai Kosjar
760aa0f8bc CppTools: Get rid of SearchSymbols::setSeparateScope()
This will make it easier to use a single SearchSymbols instance and a
single run serving all locator filters.

Change-Id: Idb6a3693ad356227d46d0b28fb4c3a5db62b4ac4
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-08-26 13:39:15 +02:00
hjk
7e09b90723 Android: De-noise androidconfigurations.cpp
Change-Id: Iba945476c4534c2901232f22b4510d023b929ebd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-26 13:09:07 +02:00
Friedemann Kleint
54d2d6ba3e Android: Fix capitalization of abbreviations.
Change-Id: Id293954706b7a510d68dd7710bd11c3b7dbcf9e9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-26 13:07:13 +02:00
Orgad Shaneh
f5db35128b Fix crash when changing a kit in project settings
Change-Id: Ib584cb5d6d1d3802f3a21b741b560ace78722b9a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-26 11:38:40 +02:00
Tobias Hunger
42cec4552b Madde: Remove unused export macros
Change-Id: I5c79493f4e4bd73b51e66a319088cbfe2756fa89
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-08-26 10:00:55 +02:00
Tobias Hunger
6659685220 Macros: Remove export macros and move code into Internal namespace
Change-Id: I2f5aa2b15235dfa7f3f002703771dd902d67199e
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-08-26 10:00:44 +02:00
David Kaspar
60cde65ba8 Qnx: BB Device Conf. wizard provides default name if hostname not found
Change-Id: I66b133d343edee762066a7e2797f9f24073dded2
Reviewed-by: Fanda Vacek <fvacek@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-08-26 10:00:37 +02:00
Tobias Hunger
160992f813 Help: Remove export macros
They were not used

Change-Id: I3e461d16937d5e5617077b394d5535be84a0b45e
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-08-26 10:00:12 +02:00
Orgad Shaneh
561f31e855 Enclose window title vcs topic in brackets
To be consistent, change the topic in the project node accordingly

Change-Id: Ie15aa62db28836330f619f0752ac488e0dd87e57
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-26 09:32:54 +02:00
Friedemann Kleint
b8e1860c88 valgrind: Fix lupdate-warnings about missing Q_OBJECT.
Change-Id: I0db53224eaf716909382f468248c893616513b5a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-26 09:24:52 +02:00
Thiago Macieira
62fb22278c Debugger: Add dumper support for IPv6 in QHostAddress
Change-Id: Ia542cf9e3c695a2c3c4b6340c3d72dfe743339c6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-08-23 21:36:39 +02:00
Guillaume Belz
3d9f8f7df7 update french translation
Change-Id: If70d24c1ffca3695bed1495cc697a12043152298
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
2013-08-23 15:25:42 +02:00
Tobias Hunger
f6a9a69ee4 TaskList: Remove unused export macros
Change-Id: I0a10ec80fc6a1f5677c13409f1ea5da4aa0d182d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-23 14:40:50 +02:00
Tobias Hunger
91377460f9 Abi: Add method to guess ABI based on machinet triplet
This code is moved from the gcc toolchain into the ABI class
so that the debugger can reuse it.

Change-Id: I9932f41f69eff9ce5982cfb1f0a2e0add33b91c9
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-23 14:38:51 +02:00
Orgad Shaneh
e33833c8d0 CodeAssistant: Do not pop again after pressing escape
If escape is pressed within 400ms after invoking completion,
it is popped again

Change-Id: Ibf34af22def54bc9a18d804ac9ee471f075eae96
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-08-23 13:51:10 +02:00
Orgad Shaneh
8f470b0512 ProposalWidgets: Accept escape key event
Otherwise it is passed on to other widgets (like the Find toolbar)

Task-number: QTCREATORBUG-5748
Change-Id: I3e7fe19327d2b3d15c9c9f84360b936dc4698dfd
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-08-23 12:54:27 +02:00
Kai Koehne
c3ed746c24 Mention also QML codemodel fix in changes-2.8.1 file
Change-Id: I94c6a92cd27b6c0bd818b9d82240b20875909f07
Reviewed-by: hjk <hjk121@nokiamail.com>
v2.8.1
2013-08-23 12:27:18 +02:00