Commit Graph

31174 Commits

Author SHA1 Message Date
Eike Ziller
26cf7be1c3 Merge remote-tracking branch 'origin/2.7' 2013-04-19 09:05:42 +02:00
Eike Ziller
3110c28cc1 Revert "Fix building treeviewfind test."
That shouldn't have gone into 2.7...
This reverts commit 4647cb77d3.

Change-Id: I4abfc8120d7c3d5a6b9e11d212f955cd66ba01a5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 09:02:51 +02:00
Kai Koehne
af57639847 README: Update Windows section
We don't recommend Qt 4.7 any more, Qt 4.8 is minimum.

Change-Id: I66dde5b7012b82380d77aab658d5e3591f30c768
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-19 08:39:37 +02:00
Lorenz Haas
cb65cf3c1b Editor: Fix crash with 0-pointer in codeassistant.cpp
Task-number: QTCREATORBUG-9160

Change-Id: Iafc7a8342a91466ac33b07b73a85d9fca228b855
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-19 08:22:56 +02:00
Petar Perisin
93e51c186a Git: make ensureStash dialog more clear.
Change-Id: I19ecde462d7a8a5fb00caa0414a9833ecab5057b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-19 07:48:27 +02:00
Kai Koehne
a5b503f663 README: Simplify Compiling prerequisites
The actual compiler versions e.g. actually depend on Qt, not Qt Creator.

Change-Id: I04ea7c5d94ef445ea54a91ea9c463851fddce2c1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-18 21:25:09 +02:00
Kai Koehne
cdc8d02d12 README: Update Supported Platforms
Be explicit that the supported platforms are only valid for the standalone (non Qt5) packages.
Also update minimum Mac version to 10.6, and simplify Windows versions section.

Change-Id: Ie9d001eec4e6d5dd1ade7d54a1fc75ac0bb4d741
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-18 21:24:54 +02:00
Kai Koehne
7802868f50 README: Update botan license
Change-Id: I7c0865e25083576101de17ba1c49ddae4d67e585
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-04-18 17:21:05 +02:00
Kai Koehne
bd6480394c README: Fix product description
Qt Creator is also a QtScript/QML IDE since a while.

Change-Id: I046da1478e92e45eed7e5cccb1888a3b30b00faa
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-18 17:16:27 +02:00
Gabriel de Dietrich
fae2052549 Set "About Qt Designer plugins..." menu entry role to NoRole
This fixes a problem on Mac, where the default menu role is TextHeuristic,
and menu item syncing would reassing this entry as "About Qt Creator". Also
ProxyAction would not forward the menu role.

Task-number: QTBUG-30679
Change-Id: If5ad5fb3a34131c080543bf8160e9ab5140c8585
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-18 17:05:15 +02:00
Leena Miettinen
1a35103344 Doc: make instructions for adding kits easier to find
As the Qt version and compiler are now specified in a kit, and not
in build settings any more, the instructions for adding kits, Qt
versions, and compilers should be moved up one level, directly under
"Configuring Projects". I also added some instructions and links to them
in the text. These topics could also go into "Building and Running", but
I feel they now fit quite well here.

Change-Id: Icdf436a97e824e44a5997f39a105996c5bef05dc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-18 16:05:42 +02:00
Lorenz Haas
39d000430e CppEditor: Quick fix "move definition" keeps ctor-initialization list
Task-number: QTCREATORBUG-9157

Change-Id: Ic46086ba07a86292bbf48de62b69e3f33628fd86
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-18 15:54:13 +02:00
Lorenz Haas
7d2a7685aa Editor: Show file encoding in editor toolbar
The file encoding is shown next to the current line in the toolbar. If
the label is clicked a dialog for encoding selection is shown.

Task-number: QTCREATORBUG-8376
Change-Id: I9adee76a31929de5f698d14fe5ca5abce3cc4633
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-18 15:53:53 +02:00
Erik Verbruggen
63a04e0c15 C++: replace Q_UNREACHABLE by QTest::qFail.
Q_UNREACHABLE was introduced in Qt5, so using it impossible to compile
the tests with Qt4.

Change-Id: I0ed23ad9390b1428513a7a0c975dd8fb72efb001
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-18 15:50:00 +02:00
Oswald Buddenhagen
d77883c16a Merge remote-tracking branch 'origin/2.7' 2013-04-18 15:18:34 +02:00
Andrey M. Tokarev
72e0ded3c4 CppEditor: add more sections (protected, ...) for declaration (refactoring)
You can write definition of function, type Alt+Enter, as usual,
and select not only public but also other possible sections
like private, public slots and so on.

Change-Id: I2faefc3833c6f05c9e2e5a2a41328bcdbe17ba14
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-18 15:08:19 +02:00
hjk
f0f406bacb C++: Inline {TranslationUnit,Parser}::blockErrors
As indicated by profiling.

Change-Id: I04d741dcc6200eb351d7aec316572e0e94ef5bec
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-18 14:58:52 +02:00
Christian Kandeler
7dc52d1a54 Fix module name capitalization in pluginspec.qbs.
Change-Id: I66ca1ad22f8a857582e6d3fdb0bf2dfc8334628a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-04-18 14:18:55 +02:00
Aurindam Jana
b85eddb2ea QmlDebugging: Support both IPv4 and IPv6
Change-Id: I562780c0894f596863c4c8b9cc9b12e3a3a98f33
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-04-18 14:10:56 +02:00
Aurindam Jana
f9d2b6498f QmlDebugging: Query available port
Use QTcpServer instead of TcpPortsGatherer.

Change-Id: I85133c5ae192b407009c5b21df332c9d3d94acda
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-04-18 14:10:43 +02:00
Aurindam Jana
49f1cd5334 Valgrind: Support both IPv4 and IPv6
Change-Id: I3e7a7f0d9264c2fccb161e5d2dcf585db4fcd013
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-04-18 14:10:14 +02:00
Aurindam Jana
686b63ea84 QmlProfiling: Support both IPv4 and IPv6
Change-Id: Idb0ceb27eabff33da3db52b0b62077083e8893ba
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-04-18 14:10:02 +02:00
Marco Bubke
2557e0f39d QmlDesigner: Remove override from non virtual function
Change-Id: I8d0b782df5e0819d7f20c2294aa4be9b017a6cb9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-18 13:59:22 +02:00
Aurindam Jana
23be3df051 DeviceSupport: Add canAutoDetectPorts() method
Use case: Devices such as Desktop device can
automatically choose an available port.

Change-Id: I6515425da3ae861b62d103885e2fde0e542d21d0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-04-18 13:58:28 +02:00
Eike Ziller
55de6a9fb9 Merge remote-tracking branch 'origin/2.7' into HEAD
Conflicts:
	src/plugins/coreplugin/generalsettings.cpp

Change-Id: Ic92d637fb92748b2bb40e1a2895ea5d0644b4646
2013-04-18 12:54:37 +02:00
Eike Ziller
4647cb77d3 Fix building treeviewfind test.
Change-Id: If4211acb37cb3c87a901ebf3da030bd1da3cf99c
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-18 12:50:59 +02:00
Marco Bubke
de7a4818a9 QmlDesigner: Make the taking of ownership clean for the register functions
Change-Id: Ibb9b054f49a04be65d16e8a55c45ee6524d39729
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-18 12:38:15 +02:00
Aurindam Jana
17a26e008a Valgrind: Query available port
Use QTcpServer instead of TcpPortsGatherer.

Change-Id: I270a5a9464b2cec48b7e2da2772c8a042bf71d95
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-04-18 12:28:57 +02:00
Aurindam Jana
bd84ff7189 QmlProfiler: Query available port
Use QTcpServer instead of TcpPortsGatherer.

Change-Id: I12c53ae421fa559a7e71dd5855add2aff00ce33b
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-04-18 12:28:43 +02:00
Erik Verbruggen
4b0f70f4c9 C++: highlighter clean-ups
- Moved TextEditor::SemanticHighlighter::Result to
  TextEditor::HighlightingResult
- Moved SemanticInfo::UseKind to CppHighlightingSupport::Kind

Change-Id: I14faab1891ca691a0691cfd9243edf19fcd3d3df
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-18 12:25:24 +02:00
Thomas Hartmann
58e280de2c QmlDesigner:Instances: Adding instance for QQuickWindow
This allows QuickWindowNodeInstance to return the content item
instead.

The function parentObject() in ObjectNodeInstance now knows
QQuickRootItem, because the parent of the root item should
is the windows (which is just a QObject but treated as item from us).

Change-Id: Ibaa7ccc8dd9346689cc4443ce0b594056feaa0cf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-18 12:20:41 +02:00
Thomas Hartmann
67825ab2dc QmlDesigner.MetaInfo: Fix for qualification
If there is no package the unqualified name is the name not
an empty string.

Change-Id: I04a51fc79ea9e312e2035ce80eb0f846673a3a44
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-18 12:19:35 +02:00
Thomas Hartmann
0398eb6acd QmlDesigner.Rewriter: fix for setting node source
This was wrong and could trigger asserts.

Change-Id: I5daac224b467444d46f16a888a3ad3682f423c20
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-18 12:19:30 +02:00
Thomas Hartmann
fecde3e8a1 QmlDesigner.MetaInfo: cleanup and fix
Packages can be qualified by several ".".
We have to take this into account.

Change-Id: I5da0c624b464448dc6f16aaafa3ad3682f423ccc
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-18 12:19:22 +02:00
Thomas Hartmann
9b45d0e2eb QmlDesigner: treat window as item
For simplicity we just pretend Window is an item.
The state editing is broken atm but does not crash.
We will fix this later.

Change-Id: I5da0c624b467448cccf16a88fa3ad3682f4ccc20
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-18 12:19:11 +02:00
Eike Ziller
6a4310a44a EditorManager: Remove code duplication.
Change-Id: I366852f788c1d28351e9f853b16d180886892c55
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-18 12:13:31 +02:00
Nikolai Kosjar
b1bb093d15 C++: Fix Qt dependency (Q_UNLIKELY) in 3rdparty/cplusplus
Change-Id: I37ffb657c9e042cc1c186895efd9c58fe6e332fd
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-18 11:34:32 +02:00
Eike Ziller
bf3d142418 EditorView: Do painting where it belongs.
Change-Id: I38cbf6d884f3034321776b135270acb5c8482321
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-18 11:29:41 +02:00
Lorenz Haas
e89c30feb8 BaseEditor: Open locator "l <line:column>" on toolbar line widget click
Task-number: QTCREATORBUG-8811
Change-Id: Ia3ece9efb7e2c6d227ab3395aca636a27f667f0d
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-18 11:23:23 +02:00
hjk
ad0331a2a9 C++: Inline Lexer::control()
Change-Id: Ia37ec33fb031fdea4ad1890fcea3a80b7b46e272
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-18 10:49:51 +02:00
Lorenz Haas
13b0ca0092 Add keyboard shortcut for "New Scratch Buffer"
Task-number: QTCREATORBUG-9039
Change-Id: Iff7d821f863f2691786acaea44137d291d3dbf67
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-18 10:35:42 +02:00
Fawzi Mohamed
1a1791abba consoleprocess: use empty string as default terminal
Using empty string as default terminal avoids storing a path to
QtCreator resources (which becomes invalid if creator is deleted)
on mac.

Change-Id: I9d5fe9bce38387d82de451652df6be9ec5eb5960
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-18 10:10:48 +02:00
Eike Ziller
44931c0985 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
2013-04-18 09:22:19 +02:00
hluk
ea75b0d183 FakeVim: Correctly save input for macro
Change-Id: I648d1ec763c8a49b6d3e1bb5fb13fe1af5ae2368
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-18 09:16:14 +02:00
hluk
a23c3cb863 FakeVim: Use "backtick" mark as alias for "tick" mark
Allows to quickly type jump command ``.

Change-Id: Ie45bcf1bdf840a238e7eea1f97df70979d7d0784
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-18 09:11:59 +02:00
Alan Alpert
ccc1952327 Add methodIndex function
While not a complete feature, as it does not handle overloads,
it is still an improvement on the current functionality. Would be
a good interim measure until full functionality arrives.

Change-Id: I947adc6a6dbccf676112ac77e186134fb660efd3
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-04-17 23:25:44 +02:00
Christian Kandeler
b9fd359b6e RemoteLinux/Madde: Fix capitalization in dialog titles.
Change-Id: Icc0722341afcd09e6e5ff525c3595103f0e6e937
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-04-17 17:20:52 +02:00
hjk
d3c7220cbc Mime: Use string comparisons instead of regexps for simple globbing
Change-Id: Ia894f3663f43088cdb2d8cb685bcebecaded8146
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-17 17:13:35 +02:00
Daniel Teske
b45e7b01bf Qt4ProFileNode: Split up targetInformation
TargetInformation now contains no platform specific code anymore.

Change-Id: Id7b3b562e1046a1ea18127716532b1fc2614ef91
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-17 17:08:03 +02:00
Aurindam Jana
2a98a9f11e AndroidDebug: Removed unused gdbServerPort member variable
Change-Id: I4804e46cec3285280bcea28e7900c8b07d487fb6
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-17 16:19:13 +02:00