Commit Graph

31523 Commits

Author SHA1 Message Date
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
El Mehdi Fekari
196d8ddb55 Qnx: Activate/Deactivate auto detected configurations
Add activate and deactivate actions to only create kits
for used NDK targets and not for all installed ones.

Users may want to switch between different targets
without uninstalling non active taregts.

Change-Id: Ie023ebdedbf3494bb7f1c251ce5f7fadec9f9206
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-09-10 10:22:04 +02:00
David Kaspar
3c94b88cef Qnx: polishing bar-descriptor.xml files in Qt5 wizard templates
Change-Id: Ib943bdbfd6ebc7c9dfcbe5fd4995df86a3b73ff7
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-09-10 08:41:24 +02:00
Erik Verbruggen
87a3aac18f C++: add fallback project part querying
When a file is not part of any other project part, this project part can
be used to get at least some compiler flags, defines, etc. to use. This
can happen when either a file outside a project is opened, or when the
project description is incomplete.

Change-Id: I5d595fae7195e8b61dbad14368b6cae9eb15c21b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-09-10 07:36:25 +02:00
Andre Hartmann
fbf64eae72 AnsiEscapeCodeHandler: Fix build again
Task-number: QTCREATORBUG-10133

Change-Id: I4b12568b8ca85d55a179c4f42b6adae1d97dc2a7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-09 22:39:14 +02:00
Petar Perisin
7a24da8a51 Clear formatting if there is no number
Task-number: QTCREATORBUG-10132
Change-Id: Ib0f6deac4d66273a1a2cc59d397134588fbd3032
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-09 22:26:05 +02:00
Daniel Teske
967cebcef2 Qt4ProjectManager: Skip files that are actually directories
Since the cumulative parsing now parses for loops, we get bogus data
in creator's own .pro files.

Task-number: QTCREATORBUG-10045
Change-Id: I627772f221cc5c928458788feb036cdd93b25a08
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-09 19:12:44 +02:00
Orgad Shaneh
3a23264e05 Fix MSVC build
\e is not recognized by MSVC.
See http://msdn.microsoft.com/en-us/library/6aw8xdf2.aspx

Change-Id: I2c36d9e9a613a24895dd33e37a82c0ce3d846f3d
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-09-09 18:18:00 +02:00
El Mehdi Fekari
c10682626e Qnx: Skip debug token for internal unsecure devices
Do not require debug token for devices
with internal unsecure development image.

Change-Id: I9c222492c63a7c92c253424ccb3f7c823223c95b
Reviewed-by: Thomas Zander <zander@kde.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-09 17:53:27 +02:00
Orgad Shaneh
bdf89d1cbd Build valgrind-fake on Windows
Change-Id: If6252f9a252e9bb0626ec60bdf34fa82cda09bfa
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-09-09 17:41:27 +02:00
Christian Kandeler
afbf8bd2f7 QbsProjectManager: Remove unneeded include statements.
These headers are not public anyway and must not be used outside of qbs.

Change-Id: I037b6d98bdd46e69b7337cf47f9328477b2d3351
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-09 16:35:11 +02:00
jkobus
17e2847f7e Add lacking qrc files into the project
Task-number: QTCREATORBUG-9610

Change-Id: I3f98ce154e05f419ea8a3c45a18eb9df51b5cfa2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-09-09 16:03:24 +02:00
Nikolai Kosjar
5fcdb73e4d Valgrind: Do not ignore/overwrite tool options
...otherwise all the options the user has set are in vain.

Change-Id: I6f344aafa848e3216a8ebf98e6fdddac26af4749
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-09 15:55:21 +02:00
Nikolai Kosjar
fc86c43fd6 Valgrind: Projects: Use global settings per default
...in order to avoid "huch, it shows custom settings, but I haven't
customized anything?!".

Change-Id: I80475340202b54acbf7fbb0fe709b1e9f1cf58da
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-09 15:54:38 +02:00
Nikolai Kosjar
f6a45a438f Valgrind: Initialize custom settings with global settings
...fixes "** Error: no valgrind executable set **" for new projects.

Change-Id: I838d680d902480906fab7bec0984d45c25ec7b4b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-09 15:54:09 +02:00
Orgad Shaneh
bc7778a31d Utils: Introduce sleep function
Use it in Android plugin

Change-Id: Id3ae707d5425e99a2e5b993e1ed98dddd73809a9
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-09 15:52:49 +02:00
Nikolai Kosjar
bbdee91bc9 CppTools: Handle erroneous statements in FindMethodDefinitionInsertPoint
...at end of file.

Change-Id: Ife8142cd9cf3c5e4be2594b7cc635e5ab7b9e946
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-09-09 15:48:59 +02:00
Erik Verbruggen
3eaf044045 C++: replace a tree by a hash
Be more environment friendly by using less trees.

Change-Id: I54d3b23d697a3b72a6a803688a8da0eddaad3e17
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-09-09 15:06:51 +02:00
Friedemann Kleint
b9c64a392a Fix slashes of displayed make commands.
Change-Id: Ic35966fd86c40ba0b02d48f7bf0e19ab30779c97
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-09 14:49:39 +02:00
Robert Loehning
a22e2caadf Squish: Added further sanity checks to tst_simple_analyze
Change-Id: I40adc90d4cb73ef4ba3d7c723953d272116e193a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-09 13:50:01 +02:00
Petar Perisin
e8f5502b78 Added color support of ANSI escape codes
in compile and application output pane. Only simple font and background
controles added.

Task-number: QTCREATORBUG-9592
Task-number: QTCREATORBUG-5956
Change-Id: Ida010ed17d34bb73ae1364a77073ff435a03a060
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-09 13:05:16 +02:00
vlaomao
7e29974e4e Debugger: Added host address overriding input to debug dialog.
Task-number: QTCREATORBUG-8503
Change-Id: I385158bef63bff3a831342f090d939e4c6d7202c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-09 12:46:40 +02:00