feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
43,591 Commits 108 Branches 368 Tags
b13f964fd5403d15ece89f89f9823dd19a2bc459
Commit Graph

4296 Commits

Author SHA1 Message Date
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
Marco Bubke
7be0100298 QmlDesigner: V8 is not anymore present in 5.2 
Change-Id: Ie154a02719f4706b9edc872767b137fe6f9977bc
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-08-22 12:27:07 +02:00
Oswald Buddenhagen
c2e90c360b Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
 2013-08-21 14:39:18 +02:00
Tobias Hunger
ee47b652a6 Snippets: Allow lowercase/titlecase/uppercase modifiers for variables 
Use the same syntax already used in the custom wizard to denote
variables that are modified to be lower-/title-/uppercase:

 $tESt:u$ will become TEST
 $tESt:c$ will become TESt
 $tESt:l$ will become test

The snippet will be inserted without any name mangling happening.
Once the editing is done the name mangling is applied to all fields.

Change-Id: I7c1f5a1ad2bb5acf1b88b54de51bb39391c64763
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-08-20 14:49:17 +02:00
Sergey Belyashov
1b2675f7d6 Russian translation update 
Change-Id: I10354aa8b9bdede194d0046bd61501301d2c9863
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-08-19 11:25:10 +02:00
hjk
8ae41de20c Debugger: Fix dumpers in the presence of -D_GLIBCXX_DEBUG 
This affects std::map, std::set and their iterators.

Change-Id: I372833d04a1f96afd38f127c67052c69cbb3dc02
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-08-16 16:41:19 +02:00
Pavel Fric
e1b63dd526 Update Czech translation 
Change-Id: I65f14acf749ea055d07a65c8900461acac3ba8ff
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-08-16 16:16:40 +02:00
hjk
958a1d2d4e Debugger: Implement dumper for std::unordered_{set,map} 
Task-number: QTCREATORBUG-9855

Change-Id: I985745530d93e1c191442431a7a9449a1c4c059a
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-08-16 11:11:21 +02:00
hjk
cb4c649ac0 Debugger: Improve caching of unnamed structures 
Task-number: QTCREATORBUG-9947

Cherry-picked from 16c4c2ae64

Change-Id: I901bb87ecafc4c1260003de51678ab66122aaffa
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-16 11:11:21 +02:00
Marco Bubke
04f29127a1 QmlDesigner: Fix transformation bug for tab widgets 
Change-Id: Idc33ddf04f0b6fc317aeb5ed72fd7164ba174ab4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-08-15 15:51:02 +02:00
hjk
16c4c2ae64 Debugger: Improve caching of unnamed structures 
Task-number: QTCREATORBUG-9947
Change-Id: I701bb87ecafc4c1260003de51678ab66122aaffa
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-13 15:42:14 +02:00
hjk
e2aa5b53cf Debugger: Add dumper for QIPv6Address and Q_IPV6ADDR 
Change-Id: I85d8a484fdc3a265aa736d6a2f38ff955af8e138
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-08-12 12:41:57 +02:00
Nikolai Kosjar
92afe048ef Debugger: Fix PPToken dumper 
Done-by: hjk <qthjk@ovi.com>

Change-Id: Iaccb29d4c74922337ada05971bb392a1458c94ef
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-07 16:23:08 +02:00
hjk
6e4aa21aee Debugger: Add a dumper for KDSoapValues 
Change-Id: I2537e02e0fa5e5d41c5d0dbd82389d4a2edfd39f
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-02 12:09:33 +02:00
hjk
f990d119db Debugger: Add dumper for CPlusPlus::StringLiteral 
Change-Id: I3221374625bacdab4d7d780524250b082bea5f0c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-08-02 10:59:09 +02:00
Marco Bubke
0dd5f68152 QmlDesigner: Rename actualState in currentState 
Change-Id: I49f80126a3fc0184a3b18352ed2adc24e50040c7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-31 16:37:29 +02:00
Christian Kandeler
824c6a5c56 QbsProjectManager: Support the "plain C" and "plain C++" wizards. 
Change-Id: Idcc8459660526f972949a6f6908acc19bd52a4f7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-29 10:39:29 +02:00
Orgad Shaneh
b0283de055 Add qmlscene to qbs build 
Change-Id: I77ac542c5c826d84d74321dfe5e3e87afb4221cf
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-07-26 16:20:27 +02:00
Christian Kandeler
1f007a6264 Consolidate the different "Plain C/C++" wizards somewhat. 
We should not duplicate all wizard resources for every supported
build system -- this will not scale. Instead, have one top-level
directory for each type of wizard with build system specific data
in respective subdirectories and common data in another.
To support this approach, CustomWizard now traverses the template
directory recursively as long as no wizard specification has been found.

Change-Id: I8aad8cf36c5bf24d062f2d2c17fdb87ad12fd450
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-07-26 16:14:06 +02:00
Christian Kandeler
080277e8ae Do not offer CMake-specific wizards if that plugin is not enabled. 
Rationale:
    a) For people not interested in CMake, the wizards unnecessarily
clutter the UI. If unhandled, this problem would get worse the more
build systems we support.
    b) If such a wizard is actually used in the absence of the plugin,
nothing visible will happen after it has finished, which is guaranteed
to confuse users.

Change-Id: I070409d3185b11d2e04e33927a97843e60c657ff
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-26 15:14:02 +02:00
Marco Bubke
44bbfa3bc4 QmlDesigner: Better argument checking for the qml2puppet 
Change-Id: Ib4c83d9bb30705c23b9966696ebc7015501da154
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 14:19:42 +02:00
Simon Hausmann
c97e894a24 Fix build with Qt dev (5.2) 
QVariant now has an operator< that is ambiguous with this one.
(since commit 7ed15da3c1b9e2bb26f414a10bfc6e6d79d7cc7b in qtbase)

Change-Id: Idf38afe85cec966df1885aa2da0f37fbb3eeccf6
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-07-18 14:40:03 +02:00
Eike Ziller
5563604876 Merge remote-tracking branch 'origin/2.8' into HEAD 2013-07-18 11:54:02 +02:00
Orgad Shaneh
ad9e7ccab6 Fix coding style for else statements 
Change-Id: I1309db70e98d678e150388c76ce665e988fdf081
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-17 11:11:25 +02:00
Marco Bubke
0ba2b9b37d QmlDesigner: Add qdebugs for commands 
Change-Id: I60bdd5b36749be5092d4dabe486b101d62b3df06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-16 17:04:31 +02:00
Marco Bubke
8f22b84016 QmlDesigner: Fix the exit for qml puppet 
Change-Id: I228e91711f6976e0e6d7b298d73f61cd8c25be23
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-16 17:00:31 +02:00
Sergio Martins
01252c53df Remove semicolon from Q_PROPERTY snipplet. 
Change-Id: I3e5ae3eb17701c7c0dceca53011ab9998449f531
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-16 13:57:30 +02:00
Thomas Hartmann
f45a01b203 QmlDesigner.PropertyEditor: fixes in ComoBox.qml 
Change-Id: I409cd74c90e55006b05eb8cd71fbbfa59811fa29
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-07-15 16:38:22 +02:00
Thomas Hartmann
ba084e663f QmlDesigner.PropertyEditor: enabling layout direction 
This has been fixed in the rewriter and meta info system.

Change-Id: I4c78a915a05c01b33f779cf255c5b9c67d3e0001
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-07-15 16:29:10 +02:00
Thomas Hartmann
42b4e57f55 QmlDesigner.Qml2Puppet: crash fix 
If if have less then one argument show some help end exit.
The code afterwards assumes that we have at least one argument.

Change-Id: I555e02dc03c2319eef713b880cf43d740d64e942
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-07-15 15:19:32 +02:00
jkobus
68f860356e Update Polish translations 
Change-Id: Ide7ddf7b1ef7c89224b02a710e84f64cb02a1c15
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-07-14 16:05:28 +02:00
hjk
108085008f Debugger: Fix QUrl dumper for Qt 4 
Change-Id: I3a162bd7b8f181b8f337194004baee065b1c96ac
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-12 14:40:57 +02:00
hjk
5718a88717 Debugger: Remove some boiler plate in dumpers 
Use Dumper.putPlainChildren where appropriate.

Change-Id: I7fc26e3b04cd67d07b2d4c7b84d5c6a8dcd6c001
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-12 14:15:58 +02:00
Christian Kandeler
4677389a13 qbs build: A number of missing adaptations to qbs changes. 
Change-Id: I37452bad6a51bb8d40a13232d46c575a483c5a6c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-07-12 14:01:14 +02:00
Eike Ziller
ab0c3da08f Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I37e550646f877b50693043894976a693ac22ad5e
 2013-07-11 08:02:41 +02:00
Victor Ostashevsky
8b390350df Ukrainian translation update for 2.8 
Change-Id: Ieefff3b428a7bf45270ae80681d1b8b029bacfce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2013-07-10 14:40:58 +02:00
hjk
2a74ec4ffd Debugger: Don't use classnames as part of inames 
They may contain spaces and other things confusing the
watchmodel.

Change-Id: I87932b342de5e1b29c75ed921d4d6afddf4d51da
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-09 17:29:38 +02:00
hjk
fe296e2b25 Debugger: Disable build-in LLDB formatters for old LLDB 
This is kind of hot fix to solve conflicts with Creator's
pretty printing in the LLDB 179.5 context which does not
seem to handle SBValue.SetPreferSyntheticValue.

Change-Id: I9837bd3044a9ec90c67de3060d5895ae0b6b8653
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-09 15:16:43 +02:00
hjk
6db66ed73d Debugger: Remove spaces from template arguments 
Makes LLDB happier in subsequent type lookups

Change-Id: I1243bd3044a9ec90c67de3060d5895ae0b6b8652
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-09 14:02:59 +02:00
hjk
1c6270a811 Debugger: Fix std::string display with GDB 
Change-Id: Iaa9abd3044a9ec90c67de3060d5895ae0b6b8652
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-09 13:20:27 +02:00
hjk
5a0734a9bf Debugger: Fix std::string display with old LLDB (179.5) 
Change-Id: I9a9abd3044a9ec90c67de3060d5895ae0b6b8652
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-09 13:13:56 +02:00
hjk
b860eab724 Debugger: Fix "Show in separate window" for string-like classes 
Change-Id: I036be36070444cd761f215f3d60b9db25a5c149a
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-09 12:16:55 +02:00
hjk
997aa2e076 Debugger: Fix display of default-initialized QStringRef 
Change-Id: I3986541bb23bb7647f2a36798577a1e489fdc90b
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-09 11:43:39 +02:00
Eike Ziller
79fbb0db04 Merge remote-tracking branch 'origin/2.8' into HEAD 
Conflicts:
	src/libs/cplusplus/FindUsages.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: I20e2002c7b25cc25d8120922fa9b52e59db498e3
 2013-07-09 11:04:59 +02:00
hjk
79c8a8fbb0 Debugger: Fix libc++ std::{unique,shared}_ptr dumpers 
Change-Id: I9efb22543bf31f43381e57fb0acf4aeb15e8a293
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-09 10:20:34 +02:00
hjk
7c81f6f518 Debugger: Align dummy member names in anon structs 
Use the same numbering schem for GDB and LLDB.
More consistent, helps auto tests.

Change-Id: I9b50dd4b43bdc12fac329d33e158fa759bee4d28
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-08 18:43:36 +02:00
hjk
39e44e2e66 Debugger: Fix inames of array items with LLDB 
Harmless, but needlessly breaks auto tests.

Change-Id: Iee470411c02686b6975c1e7efd79ac802eb37037
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-08 18:43:20 +02:00
Eike Ziller
a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD 
Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
 2013-07-08 15:01:17 +02:00
hjk
0b57c8ded2 Debugger: Fix LLDB display of std::array with "complex" content 
Change-Id: I43dd9b8afe76f204fe2509f1f2f81f74c48a16ab
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-08 13:15:20 +02:00
Marco Bubke
90ce3aec8b QmlDesigner: Test mode for qml puppet streams 
Change-Id: I93128c60892900d6b4728569b84efb0ed835b51f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-08 11:28:38 +02:00