Refactor combobox values to use %1 as a placeholder for values
Change-Id: I9a9bb6b9ba5c21bcaad4a3047d322856225892bc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Preprocessor did not correctly handle when variadic macro arguments were not
provided at all, if there were other arguments: macro was not expanded
in case only the non variadic arguments were given.
#define MACRO(...) used to work fine for 0 or more arguments.
#define MACRO(ARG0, ...) used to work only for 2 or more arguments, now fixed.
Change-Id: I64e9199ceccae05618a49931c2adad8e4f9471ba
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Change-Id: Ib0d776143b787b0862d6797aaca4a1edc9865da2
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
This moves the parsing of the output from all blackberry-* processes
used in the deploy steps, and when launching the application on the
device, to a separate class. Errors and warnings coming from those
processes will have issues added to the Issues tab.
Change-Id: I455b26d77301bdfe93ece2c8470526ed174a50ed
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Adds a local variable which stores the return value of a function call
or new expression.
Task-number: QTCREATORBUG-9052
Change-Id: I1fccbdd5b9f28c8409a4b0fa24610e406de61b24
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
CppTools.lib(CppTools.dll) : error LNK2005: "public: virtual __thiscall
QFutureInterface<class TextEditor::HighlightingResult>::~QFutureInterface<class TextEditor::HighlightingResult>(void)"
(??1?$QFutureInterface@VHighlightingResult@TextEditor@@@@UAE@XZ) already defined in moc_cppeditor.obj
Creating library ..\..\..\lib\qtcreator\plugins\QtProject\CppEditor.lib and object
..\..\..\lib\qtcreator\plugins\QtProject\CppEditor.exp..\..\..\lib\qtcreator\plugins\QtProject\CppEditor.dll :
fatal error LNK1169: one or more multiply defined symbols found
Change-Id: Id53a0f8a99dbd18a9cbdf2af57b4f3970f5c41a3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This reverts commit 316f15cb3b6ce8aedaaee5a954da9d99b1090350
Wrong branch, should be master.
Change-Id: I700e8802300b8e1e093f73ea11e07c4cdb03b81a
Reviewed-by: hjk <hjk121@nokiamail.com>
Action like "Switch Header/Source" need to be performed in correct
context, in this case "CppEditor.C++Editor". But while command line is
focused the context is global.
Change-Id: Id9aa24641508a08f5196d314edc74644780c26d9
Reviewed-by: hjk <hjk121@nokiamail.com>
If the LogChangeDialog is closed without selecting any
commit, interactive rebase started with '^' as the commit.
Change-Id: I6292c700f61e5d075953ecc371d0916342096801
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
The model manager provides the import paths defined in .pro
and .qmlproject files.
Change-Id: I80846ace70f940400407cc25cec9ad6fac8b6fec
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This was missing for a couple of items and creating confusion,
if another item of the same name was used.
Change-Id: I88746a3e700940404047cc25cec9ad6fac8b6fcc
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This makes command stand out. Before it looked like regular branch.
Change-Id: I9f47e42392bb70cbd9ceec94fd4d55dc15c95b02
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Contains SourceGenerator class which was also used to generate app
template in PythonProjectManager; it saved for future use.
Change-Id: I3d44e6d33a3beabc73030acdd6740edf1745e485
Reviewed-by: hjk <hjk121@nokiamail.com>
- Moved document update handling into CppTools.
- Moved semantic info calculation into CppTools.
- Moved semantic highlighting into CppTools.
Change-Id: I253861bf074a64b1f657f7a4a8e6583871b5285f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This makes them align to the other "editor split" shortcuts.
Change-Id: I0b300ae495ffa17062a0a52b148f61015b965c29
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
After processing configurationFileName() the first time, it was added to
the already seen files (m_included). Thus, on parsing further files, it
was ignored and with that all the project defines.
Task-number: QTCREATORBUG-9107
Change-Id: Ia4817dfa3b30ed27d142f7f3eeb6f099d0653441
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
If object names are scattered across multiple lines the
script failed to get the whole object name and failed therefore.
This patch corrects this behavior.
Change-Id: Ia97e2577162b77ae1b72fdd51dda4c74c59abe25
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
So ChangeSelectionDialog does not show full path of current file, but
just path to top level dir
Change-Id: I4960009216afc0564b009bbf4f89b676cb92c4df
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This avoids locking up the UI while the keys are being generated
Task-number: QTCREATORBUG-9078
Change-Id: I2229811298f07a6c402d39dd83773fb453d2b2ae
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Setting breakpoints by file name and line does not work robustly when
using gdb, with neither the full path, nor with just the baseline. Since
typically one of the options work, Creator offers a per-breakpoint choice
of which approach to use. Traditionally, using the full path broke more
often, so the default was "short". Lately (gdb 7.3+) using the full path
seems to be more robust, so the default should be changed. Manual
overriding to "short" is still possible.
Change-Id: I9e857c86a63964bdacf9bebc5444ea752e5974f8
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Moves the handling from SplitterOrView to EditorView.
Change-Id: I187093ff4570709bac111c4cb4cf901c971a1973
Reviewed-by: David Schulz <david.schulz@digia.com>
API like findNextView were returning SplitterOrView, which is a bit
cumbersome and not necessary. Return EditorView directly instead.
Also make EditorManager::currentView an EditorView, since it couldn't be
anything else anyhow.
Change-Id: I6e8741d8bf7a98e46dd583ab929d01a9b8f89338
Reviewed-by: David Schulz <david.schulz@digia.com>
Instead of traversing the split hierarchy down from the root, including
all the branching etc, traverse the hierarchy up from the editor.
Faster in all cases, and works automatically when we introduce multiple
"roots" later
Change-Id: I50eb0fac683fb249c7ff4a63ba9fecea8d652873
Reviewed-by: David Schulz <david.schulz@digia.com>
That gets rid of a whole lot recursive searching for
SplitterOrView *findView(EditorView *)
Change-Id: I4cba09d1e88ba99072a6585b17bce83ef4cad2aa
Reviewed-by: David Schulz <david.schulz@digia.com>
This will allow changing the default to nonrelocatable.
Change-Id: I80746a3e70f94040a407cc25cec9ad6fac8b6fec
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
removes an incorrect break that limited the number of nodes processed
in updateQmljsCodeModel.
Change-Id: I82c254721ee92765cb65840c428ea08e97f587c6
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
If a bug is closed for master but still valid for the current working
branch the workaround won't be executed if started with
performWorkaroundIfStillOpen(). This leads to wrong results.
The new approach is less automatic but more error-proof.
Change-Id: If33c920be08e33c0fb2ccc4faec4ae8ff0d0f95d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Listen on either IPv4 or IPv6 localhost but not both.
Change-Id: I0fcec59fa1c21346582343ad30a9448e3ee9440f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
