feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,594 Commits 108 Branches 368 Tags
660344536df72a4b571a4592a7002a26e07e2adc
Commit Graph

31594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Hunger
f69b994896 CMake: Move watcher setup 
TO BE SQUASHED LATER!

Change-Id: I055ba795f9b47e7046edc6cb34d3d91ec4419eca
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-09-12 11:38:13 +02:00
hjk
2d89f18842 GLSL: Cleanup plugin interface 
Change-Id: I67734f0770cff14136e3795055fd5481d803f754
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-09-12 10:48:57 +02:00
Andre Hartmann
0ff2ed6460 AnsiEscapeCodeHandler: Added auto tests. 
First simple tests to check:
* pass-trough text without ANSI escape sequences
* text-color change in line
* text-bold change in line

Change-Id: I054a3fb218e95dfd5e160f1ae71dc0638bc5f239
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-09-12 10:31:41 +02:00
Tobias Hunger
acff1adf01 Qnx: Remove dead code 
Change-Id: I16aa29f1f45bd7094dbbfb00de4965d95a386f6f
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-12 10:31:08 +02:00
Tobias Hunger
ad50831a77 DiffEditor: Remove dead code 
Change-Id: I57c61b7c5adb80ab6ffecd699cd78e1351509b07
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
 2013-09-12 10:30:55 +02:00
Tobias Hunger
9e93082344 VCS: Remove dead code 
Change-Id: I9505cdd4c59f8f66e686945a3340990b195fcb55
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-09-12 10:30:41 +02:00
Orgad Shaneh
0d745d34a9 TextEditor: Fix typo 
Change-Id: Ia49320b7dfc759b3255c83ad1b282e7b1dd648fe
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-12 10:14:32 +02:00
Tobias Hunger
9603542c56 Codepaster: Remove dead code 
Change-Id: I8ee2960cf309f1e1d9db41c848be21c0442ebb29
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-11 18:26:10 +02:00
Friedemann Kleint
f728285eda Fix lupdate-warning in debuggeritem. 
qt-creator/src/plugins/debugger/debuggerkitconfigwidget.cpp:140:
Qualifying with unknown namespace/class ::DebuggerItem

Change-Id: I470a5732cc9f030905ea666cd0bc30a2379d561c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-11 16:49:09 +02:00
Christian Kandeler
3948f9d887 QbsProjectManager: Use qbs::Project as a value. 
Those objects are shared data pointers that can (and should)
be used as values. This is now actually possible due to
the newly introduced public default constructor and
isValid() method.

Change-Id: I989e339bd495aa7581b01f17f00cbffe0b617b9c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-11 16:27:26 +02:00
hjk
f9aa1207d2 ProjectExplorer: Clean up KitsManager API 
Change-Id: Ib0b11918fbae9577928b6209a913afb3eccc48b5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-11 16:25:22 +02:00
Fawzi Mohamed
dd956b326d zeroconf: fixing comparison error 
Change-Id: I0e39f8d1741a4ffa56a79456fb47b6af31d27808
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-11 16:17:15 +02:00
Nikolai Kosjar
87e793d089 CppTools: Initialize pointer to 0 
Change-Id: I55ec2d98b5fe72936ae7073e211fc6297334daba
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2013-09-11 15:47:49 +02:00
Tobias Hunger
0669547081 Dumper: Fix QImage dumper on 64bit machines 
Change-Id: I8e38ce8ace7bd11d60f90c8b4c392364da65ae59
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-11 15:14:49 +02:00
hjk
122b7344d9 Clean up SshConnectionManager interface 
Change-Id: Id1541f83f431171dbdd94d5dd48f93e1c2cdf6fb
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-09-11 15:08:27 +02:00
Marco Bubke
8336a1b7ec QmlDesigner: Remove qDebugs 
Change-Id: Iab635145cb2cde87c8d229983e1436910e90f0e4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:40:42 +02:00
Marco Bubke
bd9cf4bc87 QmlDesigner: Don't move items in a layout 
Change-Id: I9050b11d50d39726e2a19cabb7709020738a5c95
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:40:36 +02:00
Marco Bubke
820223a8f5 QmlDesigner: Re factor inline methods in NodeInstanceMetaObject 
Change-Id: I9130b166a077fd0add21b65cab8fa7eee829386d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:40:22 +02:00
Marco Bubke
eecc27e757 QmlDesigner: Adjust binding lines for binding indicator 
Change-Id: Ie001f1526f1001c9e50d5334e69d191e52fb6d7a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:40:17 +02:00
Marco Bubke
2507a24ba9 QmlDesigner: Use QQuickView::setContent to set root component 
Change-Id: I8d5700c71fd4e46f0463bf02195506251f71a853
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:40:11 +02:00
Marco Bubke
3273bac2c2 QmlDesigner: Remove space line 
Change-Id: Ib9a1e470a94e47f95241a9ce94a16703aa4f336b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:40:05 +02:00
Marco Bubke
a25f30d6c4 QmlDesigner: Remove unneeded QtQuick import 
Change-Id: Iab41ff8f1c197238c3cf78c6f99d78ee349b2137
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:39:59 +02:00
Marco Bubke
0c6a2bd7f6 QmlDesigner: Change hover feedback from dotted line to solid line 
Change-Id: If538e1d9c265b4dcf69a19a19c78c1fff9d705ab
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:39:43 +02:00
Marco Bubke
991dcc2c2b QmlDesigner: Use topMovableFormEditorItem instead of inline code 
Change-Id: I5a7e8d38c4188517ceddd8409b93d18582790ac8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:39:37 +02:00
Marco Bubke
f617295fa0 QmlDesigner: Refactor AbstractFormEditorTool::topMovableFormEditorItem 
Change-Id: If3292bd55f5efcde27b374b3902e9bf0b0678356
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:39:31 +02:00
Marco Bubke
75e57f36ff QmlDesigner: After removing xy bindings item should be resizable again 
Change-Id: I415fdd2b5d974aa72baf2c91d22ed42a5a2d8682
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:39:22 +02:00
Marco Bubke
1f4c40a9fc QmlDesigner: Hide the resize handles if a item has wh bindings 
Change-Id: I489be5fe38cef88aed34f2ea3aeb8245b29be217
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-11 12:38:07 +02:00
Christian Kandeler
3e6fcd6063 QbsProjectManager: Support using an installed qbs. 
Distributions will want to make Creator work with
their qbs package instead of adding it a second time
via the submodule, so we support that by checking for
the QBS_INSTALL_DIR environment variable.
This supersedes the current mechanism using QBS_SOURCE_DIR
and QBS_BUILD_DIR.

Change-Id: I2cff651cd23ea47b1a1434e33f80cb74ca0fc96b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-11 12:01:04 +02:00
Nikolai Kosjar
a8d7e15a5d Valgrind: Add action to load external log file 
...for the memcheck and callgrind tool.

Task-number: QTCREATORBUG-10057

Change-Id: I23dd3ad47f0498af37787bf54e76b09852cb327c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-11 11:12:51 +02:00
hjk
e8b25ac3aa FakeVim: Add another autotest for 'w' 
Change-Id: Ice665ca96eb6fc0ad50548e55d29eefe1f20f111
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-11 10:58:00 +02:00
hjk
c68e90ec5c QmlPuppet: save a few function calls 
Change-Id: Ic73b8bb417c2bf40af6146fe781c206266d3ecf8
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-09-11 10:49:54 +02:00
Daniel Teske
a3a20c5697 Android: Fix unnecessary warnings from qt about .arg 
Change-Id: I780dcf3ebd174275389620319e2d4b4784c84346
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
 2013-09-11 10:43:47 +02:00
Erik Verbruggen
f7c68f6baf C++: change working-copy to work on UTF-8 encoded QByteArrays. 
These not only take less space than UTF-16 encoded QStrings, but due to
the caching in the CppEditorSupport also take less time to build.

This patch also fixes a number of possible encoding issues, where files
and constant strings were (falsely) assumed to be UTF-8.

Change-Id: Ib6f91c9a94ebed5b5dfbd4eb2998825c62c72784
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-11 09:43:14 +02:00
David Schulz
eebb1dfcf4 Utils: Fixing codestyle issues in reloadpromptutils. 
Change-Id: I225de3015425297aeaa26e349da61ccac44272cf
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-09-11 09:21:53 +02:00
Orgad Shaneh
78930b334b Fix tests compilation 
* CPlusPlusForwardDeclarations.h not found
* Valgrind tests that include botan missing -ldl.
  botan is not required for them (they link just fine without it).

Change-Id: I279b03990ad36d01c93700d50ae8e5119bf5be80
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-09-11 09:02:16 +02:00
David Schulz
f82b6b1209 Debugger: compile fix for GdbRemoteServerEngine on windows. 
Change-Id: I9c435560f094d3e36cb6854b08687b9dfe75771b
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
 2013-09-11 08:08:18 +02:00
Nikolai Kosjar
cdb174484c Valgrind: Memcheck: Add gui options for --show-origins and --leak-check 
Change-Id: If07c7a7a11a4c555e26b672bebb1e93eded38dc4
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-10 18:01:23 +02:00
Nikolai Kosjar
548319c523 Valgrind: Add gui option "Detect self-modifying code" 
Setting this option to e.g. "Everywhere Except in File-backend Mappings"
allows to 'valgrind' Qt Creator itself.

Without that option the valgrind process will die if certain code paths
are executed.

Change-Id: I8888456d324a25ce092f0b0128407adf2159f496
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-10 18:00:48 +02:00
Orgad Shaneh
00de61a79c Debugger: Do not install simple.pro 
Doesn't belong in the install directory

Change-Id: I28578865e0424a43c5c9fbd420b37b816f147580
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-09-10 17:44:26 +02:00
Christian Kandeler
5a12889e5c Update qbs submodule. 
Change-Id: If503a0f684bc1f34835b5274298438d77d77797e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2013-09-10 17:14:45 +02:00
hjk
994075dde1 Debugger: Merge {Abstract,Local}GdbProcess to GdbProcess 
Change-Id: I46e8b4347205791eeb6ebd3ebbde9a993d892e93
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-10 16:59:21 +02:00
hjk
c260d7cdde Debugger: Silence warnings about unused test code 
Change-Id: I1800a1b84fdd03278ccb2431fb66791269ea8991
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-10 16:38:10 +02:00
hjk
d46cecebdc DeviceProcess: Add write(const QByteArray &) function 
Change-Id: Ia8e00c354056b96b966e7cdb86e51f838e70e738
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-09-10 16:36:49 +02:00
hjk
8bffed4d10 Debugger: Merge {Abstract,Local}PlainAdapter to GdbPlainEngine 
Change-Id: Idb2197e429df2fb166f042649d3e95e88c28203e
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-10 16:36:15 +02:00
hjk
ed1483741e Debugger: Remove RemoteGdbProcess and RemotePlainGdbAdapter 
Should be superseded by using a LocalAdapter variant with
(remote) DeviceProcess.

Change-Id: I9834105ff677bfe5ca527778e9795efc3b677393
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-09-10 16:35:55 +02:00
Marco Bubke
b00a7f0311 QmlDesigner: Fix attached properties call 
Accessible.role for example was not found.

Change-Id: Ibd2f47d43705d5d450e572cbb9c786c75f7912b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-09-10 16:03:52 +02:00
hjk
73bcbdfcef Debugger: Disable state machine test 
Incomplete, and doesn't work with shadow builds.

Change-Id: I491f0a48d292bfe4f7f3b318d2e5e48bcb0cabd7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-10 14:26:59 +02:00
hjk
1359cccb9f Qnx: Don't crash on startup. 
Change-Id: Id9f41f9ff74bb3d5f0ee91a7a8da0061a437cd2a
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
 2013-09-10 13:42:20 +02:00
Erik Verbruggen
3a5d3a2fe9 C++: unify highlighting/code-completion support "factories". 
Both semantic highlighting and code-completion go hand-in-hand, so now
the ModelManagerSupport class acts as a "factory" for the model manager.
Depending on the mime-type of the document in the editor, the model
manager will return the appropriate highlighter or code-completion
engine. If none is registered, the built-in fall-back is used.

Change-Id: I3e5dbb0e3b58e077dd5eda9aecb2ce5d448ac0b8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-09-10 11:45:38 +02:00
Nikolai Kosjar
0c6b64484c TextEditor: CodeAssist: Initialize all pointer members to 0 
Change-Id: I82ada400aeca5e4a4f5facf64f3f7f7d5d378b06
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-09-10 11:38:12 +02:00