Commit Graph

34419 Commits

Author SHA1 Message Date
Eike Ziller 8e51a93d37 Make find options in tool bar more accessible.
Open a popup that doesn't close on every change of an option.
Make the options button accessible through tab.

Task-number: QTCREATORBUG-11340

Change-Id: I61b83243ead4b0b3d7075c1e8f8327cd31d9c2c4
Reviewed-by: Bojan Petrovic <bojan85@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-02-28 13:43:20 +01:00
hjk 880a834b11 Debugger: Add start with step-into for LLDB
Task-number: QTCREATORBUG-11596

Change-Id: I4561d74524b70bc81345ab9beb60ec7242045509
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-02-28 13:33:49 +01:00
Friedemann Kleint e0272aefd8 Fix array format message in Debugger.
Change-Id: Ibd0a1dd6b4a48342eed5b889eff786fbebae7063
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-28 13:11:11 +01:00
Tobias Hunger da7b02df2f winutils: Fix warning about unused functions on non windows
Change-Id: Ied8a26009de64ce8b6f285d41609e801f82e61e3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-02-28 12:49:14 +01:00
hjk d190263e9a Debugger: Re-work qt namespace detection with gdb
We can always use python now. Avoids one roundtrip on startup,
a temporary file, and only does it when needed.

Change-Id: Id32a812bec477307da1d93950f7758f3a5699464
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-28 12:16:30 +01:00
hjk 762f3e32fd Debugger: Fix metaobject lookuop for older versions of GDB
Symbol.value is not available in 7.4

Change-Id: I86e00cbeef61669ca5950e35a7b0aed86dcb2f87
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-02-28 12:16:14 +01:00
Friedemann Kleint 41f2556543 Fix lupdate warnings in WinRT-plugin.
Fix duplicated messages and missing Q_OBJECT.

src/plugins/winrt/winrtdeployconfiguration.cpp:57: Class 'WinRt::Internal::WinRtDeployConfigurationFactory' lacks Q_OBJECT macro
src/plugins/winrt/winrtdeployconfiguration.cpp:148: Class 'WinRt::Internal::WinRtDeployStepFactory' lacks Q_OBJECT macro
src/plugins/winrt/winrtdeployconfiguration.cpp:197: Class 'WinRt::Internal::WinRtDeployConfiguration' lacks Q_OBJECT macro

Change-Id: I49756e05411330fb1cc6281da8cfc677e5e6d1af
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2014-02-28 12:03:01 +01:00
Robert Loehning c8027974ca Squish: Update expected project tree
Including revert of d67b7229da

Change-Id: I5712739385b4e08b494f6915cd4fc43928653e04
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-02-28 11:39:11 +01:00
Eike Ziller 689742c6e3 Use dialog parent for cpaster dialogs
Change-Id: I2561d74522b70bc81345ab9beb60ec7242045509
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-28 11:18:06 +01:00
jkobus a746f6fb27 Move internal structures and some functions into diffutils.h
Change-Id: Ia55e556fdb8de3a2aeebf768ad9db66d840766f2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-28 10:42:50 +01:00
Orgad Shaneh c09e80b853 Git: Replace %n with %1 in string
There is no plural form in this message

Change-Id: I85b584d4e53e68128279d50cb6b63e259f7a35b5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-28 10:37:56 +01:00
Tobias Hunger 1fca343157 Qnx: Add history completer to path choosers
Change-Id: I2828045d1ccd2621786b563f22cce6e5d14f37ee
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-28 10:20:35 +01:00
Tobias Hunger bdce2abf1b Qbs: Do not re-parse projects while they are built
Qbs may update the buildgraph during the build, so this information
may be lost if we reparse at the same time.

Change-Id: Id52e42552736bbe842581cc87d837d0834ad0a2c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-02-28 10:16:51 +01:00
Kai Koehne 2e167b4b93 Enable QML debugging also for generic remote linux
Add -qmljsdebugger= argument to command line, like we do for other
devices, too.

Task-number: QTCREATORBUG-11553
Change-Id: I81f9b2fde3d734cd0fc04df9d953158884e0f241
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Jonathan Liu <net147@gmail.com>
2014-02-28 00:42:32 +01:00
Lorenz Haas ba38b2043b Remove dead code
Change-Id: Id8c1ad7c34682751a914bdc6e4ee856666135855
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-02-27 21:49:07 +01:00
Orgad Shaneh c6ca15dc15 C++: Record macro uses in #if defined(MACRO)
Change-Id: I4d99053f540073483c16ce842426bf8cd3def421
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-02-27 21:08:34 +01:00
Orgad Shaneh b41b25a3f7 C++: Fix line value for tokens generated by function-like macro
baseLine is used for generating new tokens, which are
later added m_state.m_lineRef - 1 again

Change-Id: I33928a90988e8d4c317ae460647f16f87da5b155
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-02-27 20:55:58 +01:00
Eike Ziller e4c2f569a8 Fix crash when restoring settings in registerShortcut
Introduced by c5cc4b1f13

Change-Id: Id546a4cf87cfb3709f11ee32439662fcda00bdd4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-27 17:13:00 +01:00
jkobus 0ba55199b2 Prepare for patch generation, fix internals.
Change-Id: Ib3b7c5c433f9f9230eb14d23a3029681841e2e68
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-27 16:19:00 +01:00
Orgad Shaneh 5d2cd2e56d C++: Fix handling of #undef
* If the macro is defined before, track its reference
* Synchronize environment line before calling remove, which
  currently sets incorrect line
* Set macro offset

Task-number: QTCREATORBUG-10454
Change-Id: I480d16423a976a025bb8c71046610a46f9d7b0fd
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-02-27 16:13:51 +01:00
Erik Verbruggen 8ff63de728 gitignore: ignore .qmake.stash files
Change-Id: I6ebea0f6ce680ee95190be68ec2ae96ec04958ad
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-27 16:02:09 +01:00
hjk e94526100c Core: Delay coreOpened signal emission
This prevents some window restoring flickering.

Change-Id: Iead0e0f2129b969e1de7e22dbf15e641740e40e1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-27 16:01:41 +01:00
Erik Verbruggen 346e84d219 C++: introduce a project config file field in the projectPart.
This field is used by the generic project manager which passes the
".config" file in it. The advantage is that both the SnapshotUpdater and
the clang code model do not need to do anything smart, but can pass it
directly to the preprocessor.

Task-number: QTCREATORBUG-11390
Change-Id: I44fc7b20afd28fb59608412f2cce86af6f7e7d6b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-02-27 15:58:17 +01:00
Erik Verbruggen 36dccb42fa C++: fix indentation for static var decls of anonymous classes.
Task-number: QTCREATORBUG-11392

Change-Id: Ie5dd9014383b639e63653e8abc856fea9e620e49
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-02-27 15:57:40 +01:00
Orgad Shaneh 24a5c3e913 Tests: Record macro definition check
Change-Id: Ia2151ead6ba4ad2e2a3598d05dfc24a10e6a7cdb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-02-27 15:17:29 +01:00
Ulf Hermann bd43c1c51b QmlProfiler: take the left border into account when painting time marks
Without this the time marks are 1 pixel off in relation to the main
view.

Change-Id: Iee8aaee447fedb9c57934c8089874414d9000995
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-02-27 14:54:56 +01:00
Ulf Hermann 3cc743f1bf QmlProfiler: Provide a horizontal scroll bar for the timeline
This requires the consolidation of the nested Flickable elements into
one, which is probably a good idea anyway. The horizontal scroll bar is
important because people might not understand that they can use the
overview for scrolling.

Change-Id: Ie1555265fc3edafaf6e6e4f34d77b0d034d45639
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-02-27 14:54:45 +01:00
Orgad Shaneh 1817c48c7b Git: Use git describe for topic before falling back to "Detach Head"
Change-Id: Iaf8be78ac3b6119f01ad3491eec7eccfa5f45e26
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-27 14:44:54 +01:00
Orgad Shaneh f74021260a Git: Reorder buttons in branches dialog
Reset works on current branch by the contents of another, like Merge and
Rebase.

Change-Id: I904823c177dd3c79ff8e1f49fe32d82be9bb8797
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-27 14:44:27 +01:00
Orgad Shaneh 4465276e10 Git: Conditionally enable Reset button in branches dialog
Conditions:
* There is an active local branch
* The selected node is a leaf
* The selected node is not the active branch

Change-Id: I539dd13750737934378e503484646634e50a1aa7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-27 14:44:04 +01:00
Orgad Shaneh cb7f9fe496 Git: Remove refs/heads/ prefix from reset message in branches dialog
Change-Id: Ia93cbb52038c1ea29f5fa441c9eb0e88cb11d9aa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-27 14:43:42 +01:00
Orgad Shaneh 5c942d04c5 Git: Suppress show-ref command logging
Yet another plumbing command...

Change-Id: I88ba2349d8c15e47372addb3034f1bed2de170f2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-27 14:43:38 +01:00
Orgad Shaneh 18906fac4f Git: Protect against removal of the "Local Branches" node
... When a single local branch is being removed

Change-Id: I4321d045ebb6faaf5f864ff33cb4f34c15d2264b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-27 14:43:12 +01:00
Tobias Hunger d2cad7d1a6 VcsOutputPane: Filter passwords from URLs
Task-number: QTCREATORBUG-11246

Change-Id: Ib204b2e0392d1c1876f01876d7f90f56e91218d4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-27 13:53:01 +01:00
Tobias Hunger c03bcef429 VcsBase: Replace a struct with class
Change-Id: I5895e759820a358cd1d54888bfe84ddccb484967
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-02-27 13:51:59 +01:00
hjk 9e3005ee95 Debugger: Rework gdb Q_OBJECT detection (again)
We need to filter out Q_GADGETS

Change-Id: Id0ec18188e5b40506d69908e7218e3971cbddad9
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-27 12:56:15 +01:00
hluk bc45321949 FakeVim: Allow to insert space on <S-SPACE>
Change-Id: I20f3e8e6602c35b812e2a1f29fdc2b1b458468e5
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-27 12:56:01 +01:00
Eike Ziller dd10686ddb Do '&', '&&' conversion when creating id for external tool
Task-number: QTCREATORBUG-5827

Change-Id: Ib2a30a5c051be652ea99ff1923456d352b23a71d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-02-27 12:41:19 +01:00
Eike Ziller 3173548a11 Shortcut settings: Update collision markers when resetting shortcut
Task-number: QTCREATORBUG-6400

Change-Id: Ibef1da2fb71d157769412d7cbbd730e7656979ed
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-27 12:38:59 +01:00
Christian Kandeler 8a8092912b Fix location of qbs plugins.
They are not (arch-independent) resources.

Task-number: QTCREATORBUG-10074
Change-Id: If257dfc3a8a866003c84331409162699b162eb19
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-02-27 12:36:15 +01:00
Erik Verbruggen c4ef72dd39 CMake: work-around for CodeBlocks lack of framework support.
CodeBlocks is utterly ignorant of frameworks on Mac, and won't report
framework paths. The work-around is to check if the include path ends in
".framework", and if so, add the parent directory as framework path.

Task-number: QTCREATORBUG-11445
Change-Id: I794dd72d755d5593e36ebf59543d0a5e9fda3cce
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-27 12:32:57 +01:00
Christian Stenger 139a1a8dbe Squish: Fix tst_rename_file
Change-Id: Ic8c7aac5133b3df32b25188c1ab325a985cc3d42
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-02-27 12:27:55 +01:00
jkobus 9f10e8daac Refactor internal structures inside diff editor
Move "changed" property out of TextLineData into
RowData as "equal".

Change-Id: Id9cb87d099cecb61a2774e7a4fffcc162dece604
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-27 12:26:06 +01:00
Christian Stenger b8a1807542 Squish: Fix tst_session_handling
Change-Id: I85348bffe6c24be4663f67fc62e95a3e663b828c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-02-27 12:20:27 +01:00
Tobias Hunger 60be34ee3d ProjectNodes: Do not try to sort directories not yet mapped
Do not try to sort directories that were not yet mapped into the
FlatModel. This avoids an assert where QModelIndex is out of range
(-1) because the data for that directory is not yet available in
the model.

Do not bother to map the data, just forget the request to sort in
this case as the data will be sorted when it gets mapped anyway.

Task-number: QBS-521
Change-Id: I19de7513405e6a0b84c988a2a86f763e3135811d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-27 11:30:15 +01:00
Tobias Hunger 136f58c164 Nodes: Remove findFile and findFolder methods
There may be more than one matching node, so these methods provided
a false sense of reliability.

Change-Id: I6471b74a1d2dd4e8afc7e836fec45355696a0741
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-02-27 11:30:06 +01:00
Tobias Hunger 3804de5023 Vcs: Add variables containing the Vcs name (Git, etc.) and topic
This allows to have the git branch names (or tags, etc.) in the
build path or to pass that information to scripts.

Task-number: QTCREATORBUG-10376
Change-Id: I151990bdc7b85abbb427b2afae220adb4e918f4f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-27 11:16:30 +01:00
Christian Stenger ead00db2d3 CppEditor: Fix Qt4 compile
Change-Id: I3bad3687e06a5333359bd926cae2493f709aeff2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-02-27 11:15:06 +01:00
hjk 3e1a2c6c53 Debugger: Add "Separate Window" display option for QUrl objects
Change-Id: Ifd4f60a96856d15993efd857d33421f691bb8824
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-02-27 11:02:22 +01:00
Przemyslaw Gorszkowski a7bd805e33 CppTools: fix showing cyclic in a wrong level of IncludeHierarchy
File path for which we build hierarchy was not consider in cyclic checking.

Added tests for cyclic cases

Change-Id: I0c2e60034c6e8f3aa69ab723350b4c05530fcdfb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-02-27 09:02:30 +01:00