Commit Graph

29301 Commits

Author SHA1 Message Date
Eike Ziller
a2171c2d82 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
2013-05-03 09:49:28 +02:00
Tobias Hunger
6999e3c339 Remove StatusDisplay.qml from qbs build system
It is already gone from qmake.

Change-Id: Iad2835d6b937fc7215da070a1c839139419026dd
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-05-03 09:19:52 +02:00
Erik Verbruggen
364c95476e C++: fix possible null-pointer derefs.
Change-Id: Ie6a2398f3a9e5c26a9af1578e512da53a01d15f5
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-05-03 08:41:13 +02:00
Sergey Shambir
6344e2a02b QbsProject: use CFLAGS in addition to CXXFLAGS
Value will be passed to CppTools::ProjectPart::evaluateToolchain()

Change-Id: Ib365d91e9956fa59cc79107734c5ac8c89b34d4f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 18:26:09 +02:00
Sergey Shambir
9a36ec3f39 QbsProject: simplified C++ codemodel interaction.
Now it uses ProjectPart::evaluateToolchain() to read toolchain info with
given compiler flags.

Change-Id: Ia31aa1e6b9267ceac53c137e1729689046dcc815
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 18:26:05 +02:00
Orgad Shaneh
be7f73308c Git: Use consistent ordering for Merge Tool dialog
On Windows it is "Ignore, Merge Tool, Skip, Abort", while on Linux it is
"Merge Tool, Ignore, Skip, Abort"

That makes Ignore default on Windows, which is confusing

Change-Id: Id7e9e8dd6fd5748d518de4d94db47ae075268627
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 17:30:57 +02:00
Orgad Shaneh
a14968e178 Qbs: Use proper function signature for virtual functions
Detected by MSVC2010

Change-Id: I6ba98a72b8cf4e265887f256bebdd5d1582dbed8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 17:27:28 +02:00
Thomas Hartmann
e0f50c0468 Wizards: Adding simple wizard for QtQuick.Controls
Change-Id: I80746a3e77f94040a407ce25cec9ad6fac8b6fce
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-05-02 17:14:26 +02:00
Orgad Shaneh
20f1208e0f Git: Pass CommitData by reference
It is used for both input and output, the pointer is assumed
to be valid

Change-Id: Iad9a82dfb5ea4850584d4da848076699cddd23c2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 16:52:55 +02:00
Orgad Shaneh
06da25f610 Git: Add commit type to CommitData
Change-Id: I900f3dd89eeeac61e29604ac459d36ecc6c0aa8f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 16:52:10 +02:00
Orgad Shaneh
cb055c1d0f Git: Simplify editor code a bit
* Introduce a const submitEditorWidget() and use it
* Directly use layout from ui

Change-Id: Ib566bab464d4f1c08a3f2af0edb5e1fa989c3160
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 16:47:19 +02:00
Tobias Hunger
633c11d184 Handle Qmake errors when running make in a qmake project
Qmake may be run by make, so make the makestep use the qmake parser
in addition to the rest in qmake based projects.

Change-Id: Ibdd3eb476d890d580a8417d691166c4dd33350cb
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-02 16:46:59 +02:00
Daniel Teske
3abe2a72ea UicCodeModelSupport: Make the code not so eager to run uic processes
Instead mostly postpone it until the contents are needed.

Task-number: QTCREATORBUG-9149

Change-Id: I83167537e97fbd965531d990c8073409ff7b0b32
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-02 16:39:33 +02:00
hjk
038f3c0c49 Debugger: Work around missing features in LLDB-167.2 on Mac
Change-Id: I357afd09e56f6be74187d2a5a647681dad698f98
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-02 16:32:58 +02:00
hjk
98653aa8fd Debugger: Add LLDB event handling for mixed debugger and user events
Change-Id: I357afd09e56f6be74187d2a5a647681dad698f99
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-02 16:13:11 +02:00
Tobias Hunger
c76c8df101 GccParser: Fix parsing of header files without extension
Change-Id: I4f0cc028814c0abf2ecae62aee6b38cc3e75f895
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-02 16:00:48 +02:00
Nikolai Kosjar
d47aed5201 CppEditor: Tests: Remove superfluous reference to CppEditorSupport
Also remove the introduced functions in CppEditorSupport. We can just
wait until the document is "Full Checked" via Document::checkmode().

Change-Id: I31d23016f5aa5d3c37e8e05078436ab901bfb2d7
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-05-02 15:50:56 +02:00
Sergey Shambir
7047cf0140 CppEditor: simplified Objective-C status check
Change-Id: Id318fc34b19295dacef63a7192a0ff11fef3e274
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-05-02 15:21:16 +02:00
Przemyslaw Gorszkowski
d14767a6af C++: fix highlighting type when there is using Namespace::Class
If type is not found we try to find 'using' declaration for this type.

Task-number: QTCREATORBUG-7903

Change-Id: I569db9e1a8504a5da3115ebbed2e823d5924f6ca
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-05-02 15:17:27 +02:00
hluk
e245f2d5f9 FakeVim: Break edit block only after a change
Change-Id: Ice885d3a51d0c5516ddabe8a8bdb9b1ce5ab7a06
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-02 14:52:16 +02:00
hluk
016a926ab7 FakeVim: Window movement with <C-W> and :only
Allow movement with <C-W> and h, j, k, l, plus capital alternatives to
focus furthest split.

Command <C-W>o or :only closes all splits except the current one.

Change-Id: I14ed57cff5d639c22d3eb325560922c10d0c92bf
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-02 14:48:04 +02:00
Jesper K. Pedersen
b563fc6db9 edit note should also be disabled when a note is not editable
Change-Id: I35622ee65ddb7476f43af0ef3aeb0eca6ba0ff4b
Reviewed-by: Vasiliy Sorokin <sorokin.vasiliy@gmail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-02 14:16:54 +02:00
Thomas Hartmann
3aa424ca64 WelcomePage: Show demos in the examples view
Change-Id: Idc466b7e058375c0e393eb9f9dd2cc8f58abb2af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-02 13:17:36 +02:00
Sergey Shambir
2ddb1f9849 GenericProject: simplified C++ codemodel interaction.
Now it uses ProjectPart::evaluateToolchain() to read toolchain info with
given compiler flags.

Change-Id: I97c643707e1626424824aa9b53786f146b0f4790
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-02 13:00:04 +02:00
Sergey Shambir
8ac43525fb AutotoolsProject: simplified C++ codemodel interaction.
Now it uses ProjectPart::evaluateToolchain() to read toolchain info with
given compiler flags.

Change-Id: I87fc03dbd450d8190e55de0635e1c8e1f8f11a40
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-02 12:59:58 +02:00
Sergey Shambir
535bdcc9d9 Qt4Project: simplified C++ codemodel interaction.
Now it uses ProjectPart::evaluateToolchain() to read toolchain info with
given compiler flags.

Change-Id: I9afce7090eba6fc0662981dfd065603ac235a83f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-02 12:59:49 +02:00
Sergey Shambir
2d8a9674b4 CMake: simplified C++ codemodel interaction.
Now it uses ProjectPart::evaluateToolchain() to read toolchain info with
given compiler flags, so it saves old behavior and also reads C version
and C++ extensions.

Removed check that model doesn't need to be updated, since check didn't
account ProjectPart enums.

Change-Id: I6dbebeecdb162ec5b885f9f1846756b586c22b23
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-02 12:59:44 +02:00
Orgad Shaneh
f298b063c8 Ignore dirty working directory for qbs submodule
The submodule is mostly used for building against, not
for editing.

On most cases, its internal status is not interesting,
and git scans it for no reason.

Change-Id: Ic290bd78fdb6704a15264a022125c99cf006a0db
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-02 12:38:13 +02:00
Eike Ziller
00885ca9a5 Remove code duplication in open editors window
Change-Id: I9007e1171fa6d519df8cf62978bbd2936d901876
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-02 12:29:54 +02:00
Daniel Teske
111392f6c5 Android: Make cleanPackageName automatically correct more errors
Disallow keywords, and parts that start with a digit.

Task-number: QTCREATORBUG-9200

Change-Id: Ia8b42c3015393f3e76126e311eebb728425726b7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-05-02 12:19:18 +02:00
Eike Ziller
bb37f111a7 Fix wrong unsplit icons when splitting without open documents
When doing splits while no document is open, the wrong unsplit icons
where set on the individual editor views (the ones next to the split
menu button and the close editor button).
This also happened when restoring sessions with splits.

Task-number: QTCREATORBUG-9121
Change-Id: I793670518eddee3e57fef5a4ac4a266edb450b14
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-02 12:17:28 +02:00
Przemyslaw Gorszkowski
64d80150fa C++: fix code completion when 'using' declaration inside function
Looking for using declaration when lookup a type

Task-number: QTCREATORBUG-2668
Change-Id: I11600c5be262840472dd4c9e72334760a35aa4a0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-05-02 10:42:19 +02:00
Robert Loehning
c8984dc58a Squish: Using progressBarWait() instead of waitForSignal()
Change-Id: Ia87569c080f3b54dd8f78b023408de76eb3c574c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-05-02 10:13:19 +02:00
Nikolai Kosjar
6441c258e6 Fix typo (|| operator instead of |)
Change-Id: I2a5707f04175ef96d678e57b7c61fb8d6cec4d75
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-02 10:11:07 +02:00
Tobias Nätterlund
082bf324fe BlackBerry: Browse for debug token now starts in the correct directory
Change-Id: I471f24bc65b393ee9d619198c1bb982cf93e2786
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-05-02 08:54:51 +02:00
David Schulz
ae3a25e05d GDB Makefile: added define for SOL_IPV6
Added in the ipv6 patch.

Change-Id: I2d6257b9deb1f1fdec85dd89d799e69b04b1a462
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-05-02 08:05:23 +02:00
Orgad Shaneh
3245b706bc Fix crash
Task-number: QTCREATORBUG-9230
Change-Id: I24a6277c9ca5f35c803e276da82ca2b9e9d79f57
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-05-01 09:33:39 +02:00
Sergey Shambir
ec8a01c150 CppTools: added ProjectPart::evaluateToolchain()
At this moment each project manager duplicates code that reads C++ code
model information from ProjectExplorer::ToolChain.
This change provides unified way.

Change-Id: If9ecfc40991aab90768dd69f5f10f31bbf5fbc21
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-30 17:31:43 +02:00
Sergey Shambir
6faf45a465 ProjectExplorer: extended Toolchain::CompilerFlags
Now it provides information about C language standard and C++
extensions. No new behavior added to project managers.

Change-Id: Ib7c19641f452a75c9b14cd7e33d104dcd1603720
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-30 17:31:22 +02:00
Kai Koehne
369351cbf2 Make sure QtQuick2 plugin is installed into right directory
Task-number: QTCREATORBUG-9229

Change-Id: I0ec3fef8cdc795f041c7ec39c1fd6b68a138046f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Michael Brasser <michael.brasser@live.com>
2013-04-30 16:39:41 +02:00
Thomas Hartmann
22f63eddb7 WelcomPage: fix video description
Task-number: QTCREATORBUG-9087

Change-Id: I80866ace00f940000407cc25cecaad6fac8b6eee
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-30 16:08:33 +02:00
Thomas Hartmann
2130c49102 QmlDesigner.PropertyEditor: allow translation of all strings
This patches adds the tr checkboxes to all string in the
generated property  sheets.

Task-number: QTCREATORBUG-9184

Change-Id: I4a3ff8120d7ccd5a6b9e11d212f955cd66ba01aa
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-30 15:15:02 +02:00
Nikolai Kosjar
6ab892f067 CppEditor: Clean up
Removing an unused variable and fixing whitespace issues.

Change-Id: Ib410eb5b1d7be15a58817d000891ff3c12d129c0
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-30 15:10:41 +02:00
Nikolai Kosjar
e6e30c3fd3 CppEditor: Tests: Add initial Follow Symbol Under Cursor tests
Test cases are examples from

    Working Draft, Standard for Programming Language C++
    Document Number: N3242=11-0012

Change-Id: I624c315943d6a00e821abb52eef6e0ff4a40f0d7
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-30 15:00:07 +02:00
Orgad Shaneh
c702639a8e Git: Factor out the central widget from LogChangeDialog
To be used for "amend previous commit" feature

Change-Id: Id1190d67bdd1a3dd3866a6a0f9d41be5f9baaa4a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 14:38:05 +02:00
Orgad Shaneh
7b851602cc Git: Use an enum for simple/amend commit
Change-Id: Ibea0a1f2826c67796a56414326fe6afdee654576
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 14:38:00 +02:00
Orgad Shaneh
2b41210b3f Gerrit: Add accelerators for Push to Gerrit dialog
Change-Id: If806dd9b8aefcc1ecaccf326bd08ad1fc23d71c8
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 14:37:49 +02:00
Fawzi Mohamed
ad254a980c projectexplorer:gccToolchain: add support for platform flags
Add platformCodegenFlags and platformLinkerFlags to gcc toolchain.
This also improves support of compilers (like clang) that can support
different architectures by passing the correct flags, but are not
detected without passig them.

Change-Id: If707558e704f554f27fde7948f7601c5d11835ce
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-30 14:20:14 +02:00
Friedemann Kleint
ffbbf64e29 Clean headers in QML-Designer.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I8a2e9e35980198fc4162623db044c228bd209a0f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-30 14:09:58 +02:00
Eike Ziller
a25d66a944 EditorManager: Get rid of weird logic when finding next view
Removes another algorithm that was starting from the root and took the
whole tree into account.
Instead, make findNextView a method of EditorView, and avoid any
explicit usage of a single root splitter.

Change-Id: I343030521472741a8dfd7134ed16d9beeb10d10a
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-30 13:44:56 +02:00