feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
88,532 Commits 108 Branches 368 Tags
cc05c1637778db8210ea901b8da71aeef1bde05e
Commit Graph

8660 Commits

Author SHA1 Message Date
hjk
392b3f65d2 Debugger: Speed up reading of 0 terminated blobs in dumpers 
Change-Id: Iebc64c21f4dd6f4876989e57d3a347b96e1bd449
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-13 09:22:23 +02:00
Thomas Hartmann
47e3c79b88 QmlDesigner: Updating WindowSpecifics 
Change-Id: Ic4bead3e100d00cf532fa10cda42270eb642bb26
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-10-10 17:00:37 +02:00
Thomas Hartmann
0812718905 Adding new wizards for QtQuick supporting Qt 5.4. 
Change-Id: I2af1cff65032bb583864c1c8ee3a3636a46e3c39
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2014-10-10 16:09:03 +02:00
Sergey Belyashov
f9d5bfe996 Update Russian translation 
Change-Id: If1782c8501353cb953a17f8be43abec987b67e94
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2014-10-10 15:10:06 +02:00
hjk
1baca8e797 Debugger: Add dumper for Qt3's (sic!) QString 
Change-Id: I24d266587425a5c50ec3dcb548a29877730cbdff
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-10 13:25:02 +02:00
hjk
0691bf93b0 Debugger: Remove unused dumper code 
Change-Id: Idc2d17e34bf5666c56d6f54b657867f1b0ecf943
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-10 11:37:28 +02:00
Tim Jenssen
605e869335 QmlDesigner: fix regression from last filter import fix 
- adding line ending to the import code
 - set correct fileUrl to resolve local directory imports

Task-number: QTCREATORBUG-12625
Change-Id: I2861fc5674ff0fa4f6cc9e308a22cd2853ffa85c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-10 11:16:12 +02:00
Tim Jenssen
ab21b7b67a QmlDesigner: move setObjectOwnership 
- to the same position like in the other methods

Change-Id: Ie12147de0e9030a35928a2c0a5dd38d34f998845
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-09 18:10:49 +02:00
Tim Jenssen
fd6afba3c3 QmlDesigner: improve error output of the puppets 
- errors -> warning none false outputs -> debug
 - adding some more error outputs

Change-Id: Ice61d10a87dc5ef789b7913cae166641b18ddf27
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-10-09 18:10:43 +02:00
Tim Jenssen
808094e9e1 QmlDesigner: avoid setContext warning if there is already one 
Change-Id: I2d23f8f18cce11bdfbdcb4a8d9d6d99fec7d20e6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-09 18:09:37 +02:00
Tim Jenssen
dce26fc29d QmlDesigner: use engine argument like all similar methods 
Change-Id: I1238cbd60e38ade3f54937ca8f901517c543a3ad
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-09 18:08:44 +02:00
Tim Jenssen
0ecc1114bd QmlDesigner: remove unnecessary spaces/lines 
Change-Id: I867ab5afc82e67644b7004e97886b46250f5d3df
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-09 18:08:09 +02:00
Tim Jenssen
80bc7f79bc QmlDesigner: remove commented connect 
The connected SLOT is even not existing any more.

Change-Id: Iea352ca4929146c20b897e1a8fbb00a601364068
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-09 18:07:29 +02:00
Alessandro Portale
b1176b97dd New Qt Creator logo 
Change-Id: If00ef246081b72d4f5cc64efb529461c53fb0d23
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-10-09 15:43:28 +02:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Tobias Hunger
3191aac828 JsonWizard: Replace QmlFileWizard with JsonWizards 
Change-Id: If1079db1f4e3eb4fc62d0066a43aa58c072e2290
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-10-09 10:13:21 +02:00
Marco Bubke
f3c6200513 Welcome: Keep sidebar and headers static on scrolling 
Task-number: QTCREATORBUG-12872
Change-Id: I8ab9a88203fcce60fa9f9cdf06369eb0c572a0bf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-02 12:08:03 +02:00
Tobias Hunger
3277180b0c JsonWizard: Replace Python FileWizard with a JsonWizard 
Change-Id: Iebeae1f52cf856e009a0910118829c89dd3ea222
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-10-01 12:15:03 +02:00
Tobias Hunger
ac02f6fb89 JsonWizard: Replace TextFileWizard with JsonWizard 
Change-Id: Iae2833554529c2f333d9781eb0f7fa28f3bfde79
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-09-30 17:29:16 +02:00
Tobias Hunger
ed8a9cba2b JsonWizard: Replace Java wizard with JsonWizard 
Change-Id: I93fc26e48b39635662662a9ab4040f45fa874876
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-09-30 17:29:08 +02:00
Tobias Hunger
161f33d08a JsonWizard: Replace GLSL wizards with JsonWizard 
Change-Id: Ieeeec4d1a023b7cca19e3bd23ba1aa6dd1d76e72
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-09-30 17:28:58 +02:00
Tobias Hunger
989ed95c1f CppEditor: Replace CppFileWizard with two JsonWizards 
Change-Id: If39ed6d2711fa4cc144d1b1f9738acf3d04ac225
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2014-09-30 15:14:29 +02:00
Tobias Hunger
31b83d27e8 ResourceEditor: Replace ResourceWizard with a JsonWizard 
Change-Id: I0fb76c8627f65329d1bfebecf44cc3c75e6b07b5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-09-30 10:56:32 +02:00
Eike Ziller
d008779bf7 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I6dffc1925e6bf35cf6e9fe0676c11d1a5143a208
 2014-09-29 13:40:53 +02:00
Tobias Hunger
3af3878ace JsonWizard: Make wizards translatable 
Change-Id: Ia496829dd3070ef65b2cec31ecaf30955b2900c8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2014-09-29 12:10:50 +02:00
Eike Ziller
0aecf9c195 Merge remote-tracking branch 'origin/3.1' into 3.2 
Change-Id: I5d9b1d71eea5ffaed36477d73915f4a4fb4ab90c
 2014-09-29 10:31:12 +02:00
Tim Jenssen
2bd550f3fd QmlDesigner: import only working imports 
Change-Id: Ic7d74237eeb86e34925f1b048befa5da9420c278
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-09-26 15:13:39 +02:00
hjk
bf5f14a4e1 Debugger: Fix QHash display of "compact" keys 
Add make std::string usable as "compact" key.

Change-Id: Idbfcf9d299e2dde392025166a20c3d0ab60239a6
(cherry picked from commit 2776536a7e)
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-26 09:35:36 +02:00
hjk
86918e9a28 Debugger: Add dumper for CPlusPlus::Symbol 
Change-Id: I25404bff6b53e29fa13ee35787fb6c98209a408e
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-25 17:18:29 +02:00
Tobias Hunger
9a3a3d4711 JsonWizard: Remove scratchfile wizard 
Replace it with a json wizard based implementation.

Todo: This removes the keyboard shortcut available to trigger
this wizard. We should make sure all wizards are available
for binding keyboard shortcuts to them instead.

Change-Id: I1aa76222d08371e79c40b52aeb26705f3ccb4899
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-09-25 10:55:40 +02:00
hjk
4d12c017de Debugger: Wiggle LLDB startup 
LLDB 320.* from XCode 601 was unhappy. This is an trial-and-error
to get it start up again.

Change-Id: I5dda0eef785d70abbb5798c3884ace89a8426969
(cherry picked from commit 1af0f77ea9)
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-09-23 10:41:19 +02:00
Eike Ziller
d6c73653ed Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
	src/plugins/texteditor/basetexteditor.h

Change-Id: I556a7661872b90b329a46694e335e18cddc28677
 2014-09-23 10:10:09 +02:00
hjk
1af0f77ea9 Debugger: Wiggle LLDB startup 
LLDB 320.* from XCode 601 was unhappy. This is an trial-and-error
to get it start up again.

Change-Id: I5dda0eef785d70abbb5798c3884ace89a8426969
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-09-22 18:07:16 +02:00
hjk
68106a7d31 Debugger: Show at least sizes for libc++'s std::map 
Change-Id: I91f3ece335ef660e62e93dcbbeff18dc5b0c46f0
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-22 18:00:56 +02:00
hjk
245d4b253d Debugger: Fix warn() calls in LLDB bridge 
Change-Id: I7e8a571daae6a81efb52e153c8b19e724aa56c55
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-22 18:00:44 +02:00
hjk
dbab3dc2e9 Debugger: Add a README to help with dumper command line use 
Not exactly the intended use, and whence not part of the docs.

Change-Id: I622c3aef637700c895e37f79cc6ffac7b2cd5205
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-18 13:33:57 +02:00
Robert Loehning
5f1440f322 German translation for late strings 
Change-Id: I40ab7dc02492d9e71ebb8c209ab645a5bf095c94
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-09-17 12:08:38 +02:00
Eike Ziller
914adeab82 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
 2014-09-16 15:17:21 +02:00
Sergey Belyashov
a4db6db358 Update Russian translation 
Change-Id: I22a16eaae505d43c31516db98290df3ec667b5e0
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2014-09-15 17:24:09 +02:00
Oswald Buddenhagen
df1f576666 use DISTFILES instead of OTHER_FILES in docs, templates, and editors 
the latter variable is entirely meaningless to qmake and should have
never been recognized by creator. unfortunately, qmake's dist target
wasn't very useful before qt 5.4, so it didn't occur to anybody to
actually use the variable associated with it, even though it is
semantically exactly the right thing.

Change-Id: I249857f54fdc38fb5ecac0f608e5f4140624c23c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-09-15 13:19:27 +02:00
Oswald Buddenhagen
3e4f17c164 remove pointless uses of OTHER_FILES 
these cases are automatically covered by other variables

Change-Id: Ic32411fa361346633d3127be063fcaabc9ef7c28
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-09-15 12:51:02 +02:00
hjk
1ee2759067 Debugger: Fix boost::unordered_set dumper 
Change-Id: Ib356baed758437f5b549df060ca3ee62ee61b9fb
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-09-15 12:12:13 +02:00
Oswald Buddenhagen
ca492c8fac use DISTFILES instead of OTHER_FILES in creator's own build system 
it's the correct variable to use.

Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-09-15 12:10:01 +02:00
hjk
2776536a7e Debugger: Fix QHash display of "compact" keys 
Add make std::string usable as "compact" key.

Change-Id: Idbfcf9d299e2dde392025166a20c3d0ab60239a6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-12 15:36:01 +02:00
Thomas Hartmann
a9f6f2519b QmlDesigner: Allow negative spacings for positioners 
Change-Id: I610127421b071a4bf4ed0d21aeab2b2f0c089d28
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-09-11 11:15:54 +02:00
Thomas Hartmann
ec26e687f4 QmlDesigner.PropertyEditor: Allow centering and anchoring at the same time 
With this patch center anchor and right/left/top/right anchors can
be used at the same time.

Task-number: QTCREATORBUG-11455
Change-Id: I3114eb76bdfc4226e78fd711e04849d7d7d7cd38
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-09-10 18:18:49 +02:00
Tim Jenssen
4ca49dc909 QmlDesigner: add more specifics 
Fix: QTCREATORBUG-12798

Change-Id: I8d36bb4ccae05cdb28833317d74a06e7628540a1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-09-09 16:21:44 +02:00
Thomas Hartmann
61b699b336 QmlDesigner.Puppet: Adding size hints to Window mockup 
Without defining the properties, the properties do not work and
do not get notified properly. They are also missing defaults which
breaks "resetting".

Task-number: QTCREATORBUG-13004
Change-Id: Ib36f39770930be486225b45169d2ebdb53df8df4
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-09-09 10:38:07 +02:00
Thomas Hartmann
34fb3d6a5a QmlDesigner.PropertyEditor: Change step size for reals 
the default step size of 1 does not make much sense for reals.

Task-number: QTCREATORBUG-12985
Change-Id: I28be2ca8de37f1032e8fbbe785913ae5a8f6be33
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-09-08 15:45:04 +02:00
Christian Stenger
bfdbd9c1cb Templates: Remove wrong version information 
Change-Id: I7379f79d22335d6faf0db845cdde863c5888300b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-09-08 15:26:13 +02:00