Commit Graph

32962 Commits

Author SHA1 Message Date
Ulf Hermann
3382efb71e QmlProfiler: Center the binding loop marker on events in overview
Change-Id: If16ee4335b40e6ee611f04032246620ecf29f2db
Task-number: QTCREATORBUG-13453
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-20 17:29:58 +01:00
Daniel Teske
c35a3ab344 Android: Don't default to gradle
There are numerous problems with gradle, so for now switch the default
to off.

Task-number: QTCREATORBUG-13470
Change-Id: I9d2fc216c91656a528875a0bc3b820d4f289b9b0
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-11-20 17:18:41 +01:00
Christian Kandeler
244be85f57 QbsProjectManager: Expose option to show build command lines in GUI.
Change-Id: I1407b188e72ccb7ca7b47d48f9bb3041df009b8a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-20 17:04:53 +01:00
Kai Koehne
2c8bc2700e Fix license headers
Change-Id: I810aa2d98c96040fd536ae0711041f301e5c22d7
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 16:58:22 +01:00
Friedemann Kleint
4c22153568 Editor Manager: Fix action strings for copy actions.
Change-Id: I1afdbb8c88f8af06c0759b18bac5e22eb8095ede
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 16:54:14 +01:00
Daniel Teske
049f2dd35c CMake: Add logging output to file -> target mapping
The logic for mapping files to targets is a heuristic, and a pretty bad
one. Add some logging output, which can be enabled by setting the env
variable QT_LOGGING_RULES to
qtc.cmakeprojectmanager.filetargetmapping.debug=true . This will allow
easier debugging of problematic cases.

Change-Id: I17086a30beb8962333109fce9198edde4540d169
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-20 16:30:42 +01:00
Daniel Teske
0390ece761 CMake: Further fine tune file -> target mapping
Instead of requiring that the target's source directory is a parent of
all source files, use a distance between the source and directory and
the file. This will find the wrong CMakeLists.txt in more cases but also
is much more likely to lead to using the fallback target.

This makes code completion work for http://github.com/dream3d/dream3d/

Change-Id: Ic035454c5eabe361bc7c46bd943e9a9cdee730e3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-20 16:30:38 +01:00
Daniel Teske
f88ad0ce42 CMake: Fine tune finding a suitable targets for files
Ignore targets that have no include directories, those are in general
not targets that are very useful.

Change-Id: I1cd1f7dffc73eace2f7a0897bc15dea7e6bc5fee
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-20 16:30:34 +01:00
Orgad Shaneh
8455efa2ec Theming: Hide the buttons in the theme selector
They are not supported in 3.3.

Change-Id: Iecd52e4273b9b9f5855df37e28739135f1725a2b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2014-11-20 16:25:42 +01:00
Tobias Hunger
682dd3d5ce QtKitInformation: Report correct version Id
We try hard to find the correct version, but then forget to report
that back before continuing to find a weaker match.

Change-Id: I824194fe4d13db04eba488268165b27c033d33bf
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-20 16:16:43 +01:00
Tobias Hunger
4fefe0c202 JsonWizard: Code cleanup
Make sure project is 0, clang reports a free after use otherwise.

Clean up the code a bit.

Change-Id: Ie21cc83c589fdc5eed197bd3f005b309c000cc0d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-20 16:16:35 +01:00
Daniel Teske
6a8349c9d5 JsonSummaryPage: Fix selection of best project node
Broke in 7db9c37b2d, which accidently
resulted in passing in a empty list to initializeProjectTree

Task-number: QTCREATORBUG-13406
Change-Id: I24aa52fef0eaebb335624f8e31cd05778a2da6a2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-20 16:16:26 +01:00
Eike Ziller
d52bb24e39 Revert "Add Qt build date to about dialog"
For whatever reason that only worked for local builds,
but not the packages.
This reverts commit ab83c30f87.

Change-Id: I8225e1bdd22489b619ce546ecccba420424f9880
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2014-11-20 16:06:52 +01:00
Christian Stenger
38c08abde5 ProjectPartBuild: Fix framework paths
Task-number: QTCREATORBUG-13137
Change-Id: I71a222a4048db65db462da07726ea5d6b917da8d
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2014-11-20 15:06:19 +01:00
Nikolai Kosjar
a21dda3360 QbsProject: Make initial CppTools::ProjectInfo valid
This fixes triggering the QTC_ASSERT in updateCppCompilerCallData() if
the user opens and builds the following qbs project:

    import qbs
    Product {}

Conceptually the initial ProjectInfo should stay invalid, but this would
result in a bigger / more risky change. Will be addressed in master
properly.

Change-Id: I74d3374b438884f38947f551915a80ec836a85c1
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2014-11-20 14:28:53 +01:00
Christian Kandeler
4b0992568f QmlJS: Fix potential null pointer access.
Change-Id: Ib3e6256343e912a0af4e9618d0f17e1075b94ff0
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-20 14:08:49 +01:00
Daniel Teske
99e92dce9b QmakeProject: Fix crash on unloading projects
The QmakeVfs needs to be deleted after all evaluations have been
canceled. Those are canceled in the destructors of the nodes, so
delete the nodes before deleting m_qmakeVfs

Task-number: QTCREATORBUG-13421
Change-Id: I5883f5b2daa6a13ef4facf9b9dccc125a069df94
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-20 13:26:03 +01:00
Daniel Teske
f6a9d01ddf QmakeProject: Fix crash on unloading project while parsing
Callign applyAsyncEvaluate in the desctructor might lead to further
parses, which we don't want. So bail out early in applyAsyncEvaluate.

Task-number: QTCREATORBUG-13421
Change-Id: I776ff477363a3985ebc26e9160c58c2ab9c910b7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-20 13:25:42 +01:00
Alex Blasche
7f72b7bf65 Fix broken debugging on Android 5.0
Security permissions prevent access to files not owned by the current
process. This patch replaces the file based handshake protocol with
a local server based implementation. The server waits for QTC to connect
to it and sends back the current process ID. This new mechanism works
on pre 5.0 devices as well.

The existing file based handshake remains and can be activiated via the
env variable QTC_ANDROID_USE_FILE_HANDSHAKE.

Task-number: QTCREATORBUG-13418
Change-Id: Ie40ec801f265a9e13c3220f300798c27abd97ae2
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-11-20 13:14:09 +01:00
Daniel Teske
15a2555eb7 QmakeProject: Set current Node after first parse
We reuse the m_checkForTemplateUpdate cariable, since this is going
to be reverted in master and replaced by a rework of the current node
handling anyway.

Task-number: QTCREATORBUG-13357
Change-Id: I7deb564219f258753263f3e1473625ce749393fd
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 11:44:12 +01:00
Orgad Shaneh
2e87da2480 Theming: Cache display name in ThemeSettingsWidget
Change-Id: Ia1d4949ab7153ae887ecfa98ab84953c4fb668db
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 11:35:20 +01:00
Orgad Shaneh
3441594636 Theming: Do not use absolute path for built-in themes
+ always set the global palette and base style on apply

This is required for correctly using the selected theme
with multiple installations of Qt Creator.

Task-number: QTCREATORBUG-13203
Task-number: QTCREATORBUG-13396
Change-Id: I036b96721b6d184dae43d08c5e8bc9e6d1328a7b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 11:35:16 +01:00
Orgad Shaneh
3ec16fe4d8 Theming: Store initial palette
Change-Id: Iea8b74534a59d8410814f9dd41225b88e1e81f75
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 11:35:11 +01:00
Eike Ziller
ab83c30f87 Add Qt build date to about dialog
Change-Id: I8fd680ba5436c0b854385910b2977db7b5ebc97a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 09:58:19 +01:00
Fawzi Mohamed
9181e06ef2 qmljs: avoid warnings for empty qmltypes files
Change-Id: I5cd29540afa5c7ec1a7031d6e698e873003b3f0a
Task-number: QTCREATORBUG-13354
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-19 21:42:31 +01:00
Alessandro Portale
7ca545a102 A shell script for creating application icons
This script creates several application icon files by using
Inkscape to rasterize .svg items to .png, adding shadows via
imagemagick, creating .ico files via imagemagick and .icns
files via iconutil (OSX only).

Also, this change tweaks applicationicons.svg so that the
shadows won't be cut off.

Change-Id: Ie8adf37d775fa5ea02329451932956f760c17620
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-19 19:54:41 +01:00
Alessandro Portale
b04313e14c Updated Qt Creator application logos
The leaf does not have a white border, anymore. The .ico and
.icns files now have a shadow.

Task-number: QTCREATORBUG-13359
Change-Id: Iebdc6aefb36592333f1d76cd28a407a121318bb6
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-19 19:54:01 +01:00
Ulf Hermann
4e3435a5cf Analyzer: Trigger stopIt() only once when pressing the stop button
The stopIt() slot is already connected in the constructor of
AnalyzerRunControl.

The double connection is clearly not intended and, considering that
various analyzers modify internal state from those callse, could lead
to incorrect behavior.

Change-Id: I1c68eb06729849771f4a25257a219c84a032adf3
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-19 18:57:10 +01:00
Nikolai Kosjar
beac7b9539 C++: Fix highlighting after "invalid code"
For the semantic info document we do not expand function like macros and
because of that certain macro invocations lead to invalid code that we
need to handle, e.g.:

	Q_GLOBAL_STATIC(CppTools::SymbolFinder, symbolFinder)
	class Foo {};

This change makes parsing Foo in the semantic info document successfully
again, which affects highlighting of that class.

Change-Id: I389265ac64d3f0b8b8f406d38fa58d78820b14ba
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2014-11-19 16:10:56 +01:00
Friedemann Kleint
ec5a9f0fb6 Add "Copy Path and Line Number" action to editor tool bar context menu.
Add an action to copy path:<line number> to the clipboard, allowing
to conveniently copy code locations to bug reports.

Change-Id: Ia8337289d7fc8a6dd8edcd5e418a2042e8798119
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-19 16:08:30 +01:00
Tim Jenssen
1b77ce4d8f fix MSVC2010 build
Change-Id: I756d07a0e59cadd8557f7a2fd00d434470000f3c
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-19 13:23:02 +01:00
Christian Kandeler
7188689e3d QbsProjectManager: Fix Per-product build.
We compared the display name to the unique product name to look up
the product to build, but these two are typically not the same.

Change-Id: I82d1433c5c830a38c55f6b8827a5137ff31fd859
Task-number: QBS-705
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-19 13:11:33 +01:00
Christian Kandeler
275eff97d9 QbsProjectManager: Fix infinite loop on per-product build.
- Setting the QFuture result is not enough, we also need to emit the
  finished() signal.
- Never fail silently; use soft asserts for things that shouldn't happen
  and compile pane output for things that can.

Task-number: QBS-705
Change-Id: I4dad18c2ad573a92f2a0c5aa92b596851c56541e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-19 13:11:23 +01:00
hjk
dd6331d8c9 Debugger: Reset "Load system GDB pretty printer" option again
Forcing a reset was already done with cc4943a2 but that change
failed to change the default value.

Change-Id: I6bb61d0f5b303f021910a3ae523de2e523b7ca0c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-19 13:09:15 +01:00
Marco Bubke
830c05e6c8 Add AsynchronousMessageBox
QMessageBox::warning is executing it's own event loop which leads to
crashes. Better is to use a message box which is using the main event
loop.

Change-Id: Ie05985dffcf505b25113755eece9b5e2256cd289
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-19 13:08:35 +01:00
Christian Kandeler
7214971199 Botan: Fix potential null pointer access.
Change-Id: I0bc9ea383f74dc642b17001593313044a36abede
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-19 13:05:26 +01:00
Christian Kandeler
c91980ce12 QmlProfiler: Fix potential null pointer access.
Change-Id: Ic1f52a73c910612d0664e0ea909f04729109bcb2
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2014-11-19 13:03:14 +01:00
Orgad Shaneh
716e327701 VCS: Remove redundant qualifications
Change-Id: I06b62742395a1864b44d1c1ecfed0690fe61185e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-19 12:36:06 +01:00
Tobias Hunger
5e54037fc6 JsonWizard: Support fixup expandos for lineedits on FieldPages
The fixup expando will be applied before validating a string in a
lineedit. It uses the special "%{INPUT}" variable for its input and
any change will be applied to the LineEdit.

Change-Id: Ia496eacdbe541d418acb4a977c274527387896ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-11-19 12:33:58 +01:00
Christian Kandeler
040b8855c4 QbsProjectManager: Add missing return statement.
Change-Id: I207510dfd56b1de1fc07726f126540c4b6abe3d0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-19 12:28:42 +01:00
Lukas Holecek
e0acc42649 FakeVim: Monitor external cursor movement only with FakeVim enabled
Task-number: QTCREATORBUG-13443
Change-Id: I2f8ecb92599c59e31fc931557d4bc7a6b7e306af
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-19 11:34:52 +01:00
Lukas Holecek
c50487fc9a FakeVim: Remove superfluous dot command changes
Change-Id: I5ab80ada2d2c5a7812538c4a91b5aca8aee1a5e3
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-19 11:34:10 +01:00
Lukas Holecek
7e00f03756 FakeVim: Refactor text transformation and yank
Change-Id: Ic13596d4bbfd901846575fe441607c036aba3cd5
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-19 11:34:01 +01:00
Christian Kandeler
e3ae038387 DiffEditor: Remove pointless assignment.
Change-Id: I0d2f1f4cd29334a42f2099cbb1b65628e58e1a64
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-19 11:22:24 +01:00
Christian Stenger
8f546fee37 QmlJS: Allow scan of files
Change-Id: I25fd0d76cf69fa144112de96cc677d6f316da736
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-19 10:52:37 +01:00
David Schulz
815918e37f TextEditor: Fix file encoding settings.
Changes to encoding settings were ignored because
a missing connection to the TextEditorSettings.

Task-number: QTCREATORBUG-10384
Change-Id: I84ef06490102cb8140d3293d6cff0f2a7f4f130f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-19 10:52:11 +01:00
Fawzi Mohamed
ee414262cb iostool: fix arguments passed to the subprocess
Change-Id: Ie7a1acfa2c958cd78b68aba1d8bbc2c482b44068
Task-number: QTBUG-42681
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-19 10:49:34 +01:00
Christian Kandeler
f451908de4 VcsBase: Fix potential null pointer access.
Change-Id: I446524500b13c98edeb64e9af7d1d3390327b913
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-19 10:19:25 +01:00
BogDan Vatra
079711953a Fix potential crash.
Change-Id: I03c86d2071ce612424bac9bf92a25208d0ba9443
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-18 18:01:31 +01:00
Ulf Hermann
aa34d93e3c QmlProfiler: More precise drawing for selection rectangles
Keep the rectangles in the row they belong to and use MiterJoin to get
sharp corners.

Change-Id: I0dc9106975ccb550bfb5b5645865d0ea9318d577
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-18 17:23:16 +01:00