Commit Graph

31174 Commits

Author SHA1 Message Date
David Schulz
fc00973985 cdbext: Fix dump of QString inside QVariant.
Change-Id: I137f92c6ff744e15efe3d24cbf28206b62a30d5e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-22 12:22:28 +02:00
David Schulz
788286068e cdbext: Add QPixmap to the QVariant dumper.
Change-Id: Ia1d6b845180239c0d0d3ccfcd7360d16e463cd96
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-22 12:12:15 +02:00
Aurindam Jana
ec08993b13 DeviceManager: Fix bug
Port list of desktop device was force updated.

Task-number: QTCREATORBUG-9055
Change-Id: I6b0c2247b16875c12842cd6fba6354eecbd29455
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-04-22 11:31:13 +02:00
Marco Bubke
06cfc22fe2 QmlDesigner: Remove old function
Change-Id: I065a6febd74e13740117e0a5223fa71648a7c430
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-22 11:23:27 +02:00
Andrey M. Tokarev
6d65de24b6 CppEditor: small fixes
It's better to initialize m_isSortingAllowed by true
in both constructors (patch to commit where
m_isSortingAllowed appears)

Change-Id: I3d04d4dcd5afdd45a7bc7e05b2de6799d3f5c82d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-22 10:53:43 +02:00
Erik Verbruggen
cd581ecd0b C++: do not run GC when exiting.
This operation is quite costly if a lot of files are involved, and in
case of exiting Creator, it's also useless.

Change-Id: I97d178d47a3a2f6b214f7ebc45c871edd26b8286
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-22 10:08:55 +02:00
Przemyslaw Gorszkowski
564c9b2842 C++: fix support for typedef of templated typedefs
Fix:
* code completion
* follow symbols
* find usages

Task-number: QTCREATORBUG-8375
Change-Id: Ia40273fec3dead76acad4695b852a9e53065d8a7
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-22 10:06:05 +02:00
David Schulz
b782d191cf cdbext: Add dumper for QPixmap.
Change-Id: Ib3935ed8ea03500e5787dcfdf9828f18539ffc93
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-22 10:03:47 +02:00
Christian Kandeler
aefb967109 Update qbs submodule.
Contains a fix for in-source builds.

Change-Id: Ie33bf2fa8c615498c42ec17c66c0860320dd9bf9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-04-22 09:31:16 +02:00
Orgad Shaneh
83b57eda89 VCS: Remove redundant calls to default constructor
Change-Id: I4521e26e72c85e896e58e4d9d129f92b2d80f869
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-22 09:29:12 +02:00
hluk
33f4adf072 FakeVim: Keep undo/redo integrity while the plugin is disabled
Change-Id: If17252ecfd7adc6bbe518ce97908f1f8fb2772f1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-22 09:00:20 +02:00
Petar Perisin
44f14351b4 Git - command in progress in Topic
Change-Id: I83a00e9677924efc244a91d20cdded77ee9cdff0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-21 23:09:36 +02:00
Petar Perisin
311ca8cd01 Git - added continue and abort
Change-Id: I3dd274ad827c7cbd94d849b991cc518eff7f18ae
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-21 23:07:46 +02:00
Pawel Faron
ec145f36f3 Added new filter into "Import Existing Project" and "Edit Files"
Extended classes:
- SelectableFilesModel
- SelectableFilesDialog
- FilesSelectionWizardPage

Task-number: QTCREATORBUG-8805
Change-Id: I0ff2f458fce2d7b0ceee24ace7dc2fafddc5ad5d
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-19 20:41:05 +02:00
Aurindam Jana
adb6e518ef AndroidDebugging: Enable Cpp/QML mixed debugging
Change-Id: Ie748b52a93916b332f1e4fa7c6ff04dd6cc30bfa
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-19 18:43:56 +02:00
hjk
893eb51c75 QtVersionNumber: Make it smaller and faster
This yields 1% speedup on total startup with -noload Welcome

Change-Id: Ib3f1e45032c4a2dbe21ae86a1df65d118f89cba1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-19 18:41:22 +02:00
hjk
fe2fa21405 Compile fix
Change-Id: I76fe5a046a7e69248613090aeba8e25e5ea4a3c5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 16:49:35 +02:00
Gabriel de Dietrich
79428126e4 Set NoRole menu role on toggle fullscreen action
Again, since the default menu role is TextHeuristicRole, and when we
enter fullscreen the text is set to "Exit Full Screen", the Mac QPA
menu item syncing will assign this to be the quit menu item.

This would cause two problems. First, pressing Cmd-Q in fullscreen would leave
fullscreen mode instead of quitting the app. Second, that would make the quit
menu item to be hidden when leaving fullscreen, since the toggle fullscreen
action text would change back to "Enter Full Screen", and the make a round
trip to the menu item heuristic logic.

Task-number: QTBUG-30654
Change-Id: I7524c54c3bd77cce891c57292825f02e163fd7fa
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 16:23:22 +02:00
Eike Ziller
b450b3071e TextEditors: Separate away methods that actually work on a document
Introduces ITextEditorDocument. This is part of a more general "use
documents instead of editors whereever possible". It will allow to move
to e.g. ITextEditor::openedTextDocumentContents() instead of
ITextEditor::openedTextEditorsContents().

Change-Id: I5ebceaa257a0d2c3e8ac4ac51b9b08b6faa42487
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-19 16:21:30 +02:00
Eike Ziller
e31575a493 VCS: Clean up submit editor handling
It was not possible to simultaneously open two commit editors for
different version control systems, also there was no reason to scan all
open editors for the submit editor, since the plugins can just remember
the editor that they opened.

Change-Id: I1bea6ece3cd6faa1ecc0566bdd6f5fb10c816963
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-19 16:21:06 +02:00
Leena Miettinen
cf2b3f2e61 Doc: pointers to configuration options
Add short descriptions of configuration options that we get a lot
of questions about, to make it easier for users to find the information
in the Manual.

Change-Id: I9e5dca80dc99fbf9d241aba9d392ac11d784c5a7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
2013-04-19 16:03:03 +02:00
Tobias Nätterlund
d4f763edc6 QNX: Fixed creation of QnxRunConfigurations
Broken in commit 1650c22b

Change-Id: I4661af7199900dc56405cd277eb0c26cf4acfd7f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 16:01:25 +02:00
Tobias Hunger
96c2b2702c Qbs: Add frameworkBuild option to qbs configuration
Change-Id: Idf9fe91e1a40b86da3d43fe26119ccb7d88ff190
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 15:54:50 +02:00
Tobias Hunger
0b1d227355 Qbs: Prefix Creator-managed profiles with "qtc_"
Change-Id: I64b5eff31ca7ef7d89d9c50ae2ad300f095532bc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 15:54:45 +02:00
hjk
4d6ce81e0c Debugger: Don't scan directories that do not exist.
Change-Id: Ie79249039643041fd68da6766b0e6f3ca6080b86
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-19 15:26:43 +02:00
Daniel Teske
d340d26eb3 Android: ant auto detection
Change-Id: I3afaab99c8e71a6dabe6d61ed55247a1cecc2d45
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 15:01:47 +02:00
Daniel Teske
2d568e79c4 Cache BuildConfiguration::environment()
Change-Id: I865593f46feb332c385733c53de5884e5cd3751a
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 14:51:39 +02:00
hluk
2ed88c44fd FakeVim: Don't overuse cursor setting and scrolling in editor
Set new text cursor and scroll in editor widget only if it's only
needed. Sometimes these action can have side-effects.

Set new cursor and scroll especially after no pending input and commands
are available to process for FakeVim.

Change-Id: I47df4d0328ac990e2e5c6981955ea7d1bd608c71
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-19 14:40:30 +02:00
Erik Verbruggen
8b8a5db129 Revert "C++: fix support for typedef of templated typedefs"
Infinite recursion in the lookup of:
struct common_type {
public:
typedef typename common_type<typename common_type<_Tp, _Up>::type,
                             V>::type type;
};

This reverts commit 9a56ce4e85bec81c521258f44e9076d0bc9cce92

Change-Id: I675fe39018789cd04127d105eb983d2cb7798ca5
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-19 14:14:13 +02:00
Orgad Shaneh
5658eb69aa Git: Add Mixed reset (as default)
This is the default in Git

Change-Id: I65b5c0003a731799812d143d3142b58b30ddb878
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 14:12:36 +02:00
hjk
aacd884287 Debugger: Mac/LLDB run fix
"settings set interpreter.prompt-on-quit off" does not
exist on Mac

Change-Id: Ib4575be58a669193813036c4c8f4f48cc3d358e8
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-19 14:12:29 +02:00
Orgad Shaneh
e6da908321 Git: Refactor reset
Remove enum, provide the associated flag in the combobox.

Change-Id: I1c4751c75f59312904fe7c175678f965ac16741d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 14:12:25 +02:00
Tobias Hunger
cbfeb36ce7 Qbs: Add icons to Project-/Product- and GroupNodes
Change-Id: Ifedfe50e661320d5a4d26e2ef01a482afb6a76dc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 13:35:59 +02:00
Tobias Hunger
65f8e1b977 Qbs: Remove implicit Group with the same name as the Product
Task-number: QBS-257

Change-Id: I63d3095a2da171a27611d2c77d4e2ca914908a06
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 13:35:49 +02:00
Eike Ziller
0d5c886af3 Adapt the Qt Creator plugin project template to recent changes
Change-Id: Id5cc8642547a3698d2e11b956f0c1cfe3e8bea1e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 13:30:04 +02:00
Tobias Hunger
20874ca295 Revert "Qbs: Add icons to Project-/Product- and GroupNodes"
This patch got applied in the wrong sequence.

This reverts commit c5a0205a591f6b5ebdd51559d91e1faf7d4955f0

Change-Id: I37e77ae3a15890c73ea2821f6fa07b1fa100176d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 13:20:32 +02:00
Tobias Hunger
314bc49144 Revert "Qbs: Remove implicit Group with the same name as the Product"
This got applied in the wrong sequence.

This reverts commit 850e3eda14e41884c53932b67dffd573c2616c43

Change-Id: I604ba711e63cf207af6bca6110320632ec3cb72a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 13:20:00 +02:00
Tobias Hunger
ddacb661c3 Qbs: Remove implicit Group with the same name as the Product
Task-number: QBS-257

Change-Id: I63d3095a2da171a27611d2c77d4e2ca914908a05
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 13:10:02 +02:00
Tobias Hunger
bb8f7a8b88 Qbs: Add icons to Project-/Product- and GroupNodes
Change-Id: Ifedfe50e661320d5a4d26e2ef01a482afb6a76db
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 13:09:32 +02:00
Tobias Hunger
892066cfa6 Qbs: Fix display of project tree
Do not display a folder below the Groups if the files are in the same
directory as the product definition.

The product directory is chosen since the groups can be implemented
elsewhere as done in creator for the pluginspec groups.

Task-number: QBS-257 (partial)
Change-Id: I0e39bbc62f991f2485adb3c4b47dd62dfa72763c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-19 13:09:20 +02:00
Eike Ziller
37cd957a94 Now really fix the treeviewfind test for 2.7
Change-Id: Ia3d1fa31bb8045ecb7638c5dfe800bb57f449cfa
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-19 12:50:41 +02:00
Przemyslaw Gorszkowski
13913ed391 C++: fix support for typedef of templated typedefs
Fix:
* code completion
* follow symbols
* find usages

Task-number: QTCREATORBUG-8375
Change-Id: I6f35e809ba15f224c5a6d9b2fcfc18dbfba55411
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-19 12:19:20 +02:00
hjk
357ffaa8bc C++: Use more direct approach to recognize special Qt tokens
Change-Id: I45399a196500cbc6aecedfaa94a50890914906f1
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-19 12:16:13 +02:00
Przemyslaw Gorszkowski
080bf4ecb8 C++: improve support for anonymous classes
Fix:
* highlighting
* find usages
* follow symbol
* code completion

Task-number: QTCREATORBUG-6497
Task-number: QTCREATORBUG-8963
Task-number: QTCREATORBUG-3610
Task-number: QTCREATORBUG-7579

Change-Id: I3dcaf1c515d0199c3e6bee72284fbb40064686ee
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-19 12:14:56 +02:00
Nikolai Kosjar
a2b2857b44 CppEditor: Rename CppPlugin to CppEditorPlugin
Change-Id: Icebf85ae425f413ed0d3dfc873869665233ec58c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-19 12:09:45 +02:00
Tobias Hunger
e3ecf4232c Qbs: Add Qbs install step
Change-Id: I0fb96cf2f3ba90d226203703f755025020680ac2
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-04-19 12:05:27 +02:00
Tobias Hunger
8ac0f17efd Mac: Make Compiler details widget nicer
Change-Id: I1e00eacb6cd1b10c97f351656c9a59eaae9d6256
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-19 11:32:18 +02:00
Morten Johan Sørvig
3779147ffc Add 2x icons for retina displays.
This change updates the mode selector/fancyactionbar
in Qt Creator with new high-resolution icons.

Set Qt::AA_UseHighDpiImages on Qt 5.1 and higher to
make QIcon generate high-dpi pixmaps. Add "@2x" mode
images.

Update StyleHelper::drawIconWithShadow to handle high-dpi
pixmaps. The shadow-drawing algorithm is kept in device
pixels.

Change-Id: I411b7a24e534a2d75a1bbdc4d10219dcbea26bed
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2013-04-19 10:37:29 +02:00
Thomas Hartmann
63088a000d QmlDesigner.Controls: Adding missing items to library
Change-Id: I96b7916b4ce64c404c175e72edc2b0a3ef015155
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-04-19 10:16:24 +02:00
Eike Ziller
87284f7df8 Revert "Revert "Fix building treeviewfind test.""
Reverts the revert that was needed for 2.7.
This reverts commit 3110c28cc1.

Change-Id: If7f4d22f3d339842e6a5846e2edb99e2c961a794
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 09:06:39 +02:00