* 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>
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>
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>
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>
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>
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>
... When a single local branch is being removed
Change-Id: I4321d045ebb6faaf5f864ff33cb4f34c15d2264b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Variables that we want to check should not be optimized out.
Change-Id: I8af633094674ff78b43b27756a662221b2c56e99
Reviewed-by: hjk <hjk121@nokiamail.com>
They are not (arch-independent) resources.
Task-number: QTCREATORBUG-10074
Change-Id: If257dfc3a8a866003c84331409162699b162eb19
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
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>
Move "changed" property out of TextLineData into
RowData as "equal".
Change-Id: Id9cb87d099cecb61a2774e7a4fffcc162dece604
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
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>
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>
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>
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>
"Included by" was infected by infinite deep tree in case of cyclic.
Change-Id: If84fe52399f49d52baa42d681ab125d10d89dd3e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Now include hierarchy model is printed as a string
represantation and can be easily compared to expected
situation.
Change-Id: I6aeff860744710015c5891ad0db4fdb62942f1cd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
The brace depth wasn't explicitly saved as block state and thus got
reset to 0.
Task-number: QTCREATORBUG-11566
Change-Id: I6c4f3c3392c01d65d7037c4723701ca8935ff70e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This also fixes the issue that shortcuts of designer integration gets
lost if it doesn't get initialized.
Task-number: QTCREATORBUG-4264
Task-number: QTCREATORBUG-11399
Change-Id: Ieb4fe5fd345e69aa62403e4578fa6028400aff6f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
As QQuickView is a window with its own event handling, disconnected
from the main window, we need to relay relevant events manually.
Task-number: QTCREATORBUG-11535
Change-Id: If316225ecc01ddc4255c209d7df70a9cee812596
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
The documentation indicates that onPaint can actually be called
while the context isn't ready.
Change-Id: I32d861e016e5e990f3d940a35ec28956902041ba
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Since the id is now a member, it must be explicitly set by
implementations.
Change-Id: Ibaa6ac604033ae0370e815b1e3d369dac99b36bd
Reviewed-by: hjk <hjk121@nokiamail.com>
