...to also test combination of Qbs using Google Test.
Change-Id: I4a5d32a32bfaadd0dfaaa4884b58d2ac1a952bd3
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This keeps user-overrides made via other tools visible in Creator.
Change-Id: Ice07bebb2b82f29ecae83e442bc2090af7f2ee06
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Do not check tokens which are returning the default return value.
Do not check for tokens when a previous condition excludes the other
token types.
Change-Id: Id97aed9d6342c6c12e9b26acdd0a8c4b0bca0868
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
So far, conflicted files were displayed like added ones.
Now they are marked obvious, as they disable the commit button.
Task-number: QTCREATORBUG-16297
Change-Id: Iedf834408a747c4fe5f2133790c5fb81e7fea265
Reviewed-by: Hugues Delorme <delorme.hugues@fougue.pro>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
The tools' ability to hook into processing of the output is
retained by making the function virtual.
Also remove the unusual overload of the RunControl::appendMessage
slot and the signal of the same name by renaming the signal.
Change-Id: If3c3cc2dd9c933169dc30b16e3165c9b3cf1440e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
- fixed cases where the user got the one and the other
dialog
- not only the first error is shown, the user can browse
Task-number: QTCREATORBUG-15772
Change-Id: I27786b0e4f9c987646a69d8d7d9ff33e3702587a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Do not use QObject::tr().
Change-Id: Id3631a8e90bc821377a8b3b7e0aae22b355274d3
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Extened AST visitor for outline, declaration and locator to include
Javascript methods, prototype functions with formal parameters for
better readability.
Change-Id: Ifbb2b157699c929412196f356b0c28ae0564f866
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Somewhat better encapsulation.
Removes the "false" sharing of Concept implementations, and takes
the opportunity to change the operator==() into a 'canReUseOutputPane'
function to be explicit about its only use.
This doesn't solve the change in output pane reuse behavior yet,
but provides the base to put the required logic into canReUseOutputPane,
as opposed to abusing the general equality concept.
Change-Id: Id9e4e6b8601c5fcf40a252fb423c2c4c2b74ddb6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Collects all the needed data from a source and build directory,
which then can be used instead of a source directory in combination
with an installed Qt Creator, to build plugins.
On Windows and OS X the plugin can still only built in the same
mode (release or debug) as the used Qt Creator install.
Change-Id: I21119cc0681f1a5f657c969f5d1e7a23d69aedfe
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
All surrounding lines use operator<<(), so be consistent.
Change-Id: I9b301d0d00a17f0281142dd2c67c43bd7f2a680d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
When using P4CONFIG one can user multiple p4 workspaces.
For every workspace one needs to have a p4config.txt file,
which contains the P4CLIENT, P4USER, P4PORT variable values.
Qt Creator will query on various directories for p4 configuration.
"p4 client" command will give an error if a p4config.txt file is
not present. p4 will try to connect to localhost when P4PORT is
not set and give and error, but it will take a long time to
timeout.
This timeout gives the impression that P4 does a lot of work and
Qt Creator will sometimes freeze.
The solution to this timeout is to set P4PORT and P4USER. In
this case "p4 client" will give back the same generic "Root:"
variable e.g. c:\p4, which will be seen as a valid path and
PerforcePlugin::setTopLevel will be called and thus setting the
path of the current workspace, which is not valid.
Fortunately in this case "Client:" and "Host:" variables in the
output given by the "p4 client" have the same value. "Client:"
will probably never have the same value as the "Host:" value,
thus making it safe to ignore these invalid "p4 client" calls.
Change-Id: Iafb2640cccd7bd10c455d33ea9d36c5eae2e2951
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
in preparation for experiments with the target selector bar.
This also exposes hard-coded colors to real code, making it
more accessible to Utis::Theme styling.
Change-Id: I14f16b82d074b86a51f176eb948c93b48779368f
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
propertyeditorview.cpp:191:5: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
propertyeditorview.cpp:201:9: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’
Change-Id: Ie9fd7afe060b4e4a8052fffd144fe3e908d3d18e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
The current version of qbs handles this automatically.
Change-Id: I81905335fd3366198164436e7125944ad8a3d304
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Commit 506fc40a31 broke running the analyzer with
absolute paths.
If the clang executable name is provided, the ".exe" suffix is not needed since
we get the absolute path with Utils::Environment::searchInPath(). However, for
absolute path we need to ensure the presence of the suffix in order to point to
an actually existing file.
Also, compare case insensitive.
Task-number: QTCREATORBUG-16234
Change-Id: I9f39386c099cc544297239eca56a95c2e7430555
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
