Commit Graph

48640 Commits

Author SHA1 Message Date
Tim Jenssen 7f757884c5 Clang: Extend clang query
It's a first step to introduce clang query.

Change-Id: I4d001a8883f56066765ce6bc561fa3f49611c0a4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-23 12:16:04 +00:00
Tobias Hunger 52fc4a4ebd CMake: Make sure to never trigger a timer on an destroyed object
This object might have gone out of scope by the time the timer hits.

Task-number: QTCREATORBUG-17289
Change-Id: I4b9ea75c9b4b1c905ece44965e80a5accc3590f3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-23 12:06:15 +00:00
Tobias Hunger 2d777a8082 SDKtool: Make AddKit handle cmake related settings
--cmake <ID>, --cmake-generator <GEN>:<EXTRA>:<TOOLSET>:<PLATFORM>
and --cmake-config "<KEY>:<TYPE>=<VALUE>" are now supported.

When using --cmake-generator <GEN> must be set, the rest is optional.

--cmake-config may be repeated several times. All will end up in the
kit in the sequence they appear on the command line.

Task-number: QTCREATORBUG-17290
Change-Id: Ida79d65095682331f53d0fbb36d606ad16e6c4ac
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-23 12:06:08 +00:00
Tobias Hunger 5f6a3f90fb SDKtool: Add rmCMake operation
Task-number: QTCREATORBUG-17290
Change-Id: I17363e44614aebcc06786b791249ce9468b37eb4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-23 12:06:03 +00:00
Tobias Hunger 9943a638dc SDKtool: Add new addCMake operation
Task-number: QTCREATORBUG-17290
Change-Id: Ia81408a8b84a3b675e5518b8b3529a9afcb0521d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-23 12:05:58 +00:00
Tobias Hunger 94a1e5696a SDKtool: Add cmaketools.xml support (via shortcut)
Task-number: QTCREATORBUG-17290
Change-Id: Ia13a7fae2ab7db5e66162d6219d0e58f94efe8bd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-23 12:05:52 +00:00
Jarek Kobus d34414b428 Make some variables const
Change-Id: If0b6939d2c8446526f6d779486776bbea62fbc67
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-23 10:57:34 +00:00
Jarek Kobus 2c050f7750 Don't use static variables in differ
Now the differ may run in parallel
in many threads. Static variables
may lead to crash.

Change-Id: Iae0d7678cdca3e57cb619141081250b458852bfb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-23 10:57:15 +00:00
Marco Bubke ddfd29852a Utils: First step to extend search results for clang query support
We need multi line support, multi text range support. This is only adding
enablers and adds later the multi line and multi text support because this
triggers larger changes because you have to know the text document.

Change-Id: I44e46d9d80d7d73b2650c69cc83657c20c85bfae
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-23 10:48:59 +00:00
Tim Jenssen 8a7f21195a QmlDesigner: improve resetModelSelection code
Change-Id: I09e1fb64b2d3aadcec43beae52d8440ed920c54d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-11-22 12:33:05 +00:00
Orgad Shaneh 374c0774e1 QmakePM: Fix Build from context menu on subproject node
Change-Id: I80a840c1003e7ff198b8ce1cba7dec86823fedf0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-22 09:11:24 +00:00
Jake Petroules d7e0708d1a Let qmake handle asset catalog compilation on macOS
Change-Id: I9451a0cd7b15bb6c84147298a4f1fde5d67ddf4d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-21 22:40:53 +00:00
Jarek Kobus 2144fb5949 Move diff calculation to the separate thread
It doesn't freeze creator anymore.

Task-number: QTCREATORBUG-14255
Change-Id: I3d06ea7a848e321c6072e00a73b96e9ea9770b6a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-21 15:43:03 +00:00
Orgad Shaneh 6d1d1a4416 Merge remote-tracking branch 'origin/4.2'
Change-Id: I957c22020fbacb2f631220b0cdc7fa16a782798b
2016-11-21 10:25:45 +02:00
Friedemann Kleint 97c9213358 qtcreatorcdbext.pro: Fix architecture detection
Previously, the detection relied on the variable CPU which
is no longer set current versions of MSVC.

Use newly introduced variable VSCMD_ARG_TGT_ARCH (MSVC 2017) or
Platform (MSVC 2015) to detect 64bit.

Task-number: QTBUG-57086
Change-Id: Ie71b73a04af597d5b638fd08171ee9bfb3b4ccb8
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-11-21 07:29:34 +00:00
Robert Loehning e2d142c7cf Don't crash when Help mode uses WebEngine
Task-number: QTCREATORBUG-17296
Change-Id: I8527c340e2b5af1e7f0b0d1f62ff03cd30c06ff2
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-19 00:25:38 +00:00
Alessandro Portale 3ab464dffd QmlDesigner: Improve the "export unchecked" icon
Change-Id: I1031d21c535d4a710f1f917e13bec30fb310a8c4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-11-18 18:37:34 +00:00
hjk ba87a5dace Debugger: Make QFiniteStack dumper work on macOS
qfinitestack_p.h is not self-contained, #include <stdlib.h>
manually to get access to malloc().

Change-Id: I628e5e2a872d361bb7b246ec7333efb3c94dae98
Reviewed-by: hjk <hjk@qt.io>
2016-11-18 16:30:30 +00:00
hjk fa5cd03c11 Debugger: Add libc++ std::{deque,stack} dumpers
Change-Id: Ibf95c76b89fb7673241e680c233c7514c667f261
Reviewed-by: hjk <hjk@qt.io>
2016-11-18 16:27:07 +00:00
hjk 8f12ade7bd CppEditor: Compile fix after 3b1308bb
Change-Id: I55f8f175e8cd49b455b94872770a7bd02baa7492
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2016-11-18 13:41:29 +00:00
hjk 96b907a1e8 Debugger: Fix QFiniteStack dumper and add missing auto test
Change-Id: If5f242f8d5184a0f2c62f6211f2ba89cda0cac07
Reviewed-by: hjk <hjk@qt.io>
2016-11-18 13:32:05 +00:00
hjk 5b43ff7ad9 Debugger: Make QV4 dumper test pass with Qt 5.8.0
The layout of a QV4Value has changed in Qt Declarative change 2afb54fb.

Change-Id: Iab618cc128be242c786b9a7460e80e8e49ee6544
Reviewed-by: hjk <hjk@qt.io>
2016-11-18 13:31:26 +00:00
hjk 3c3bccf0fb Debugger: Also support boost 1.55 unordered_maps
Change-Id: Id9ac4ecc8c61d4224f5840df2ec0a75c3c305825
Reviewed-by: hjk <hjk@qt.io>
2016-11-18 12:11:56 +00:00
Friedemann Kleint 3b1308bb43 TextEditor: Remove exported class QuickFixOperations
Define an operator << that accepts a raw pointer for the list of
QuickFixOperation::Ptr instead.

Fixes MSVC 17 warnings

src/corelib/tools/qlist.h(423): warning C4661: 'QVector<T> QList<T>::toVector(void) const': no suitable definition provided for explicit template instantiation request        ]
src/corelib/tools/qlist.h(389): note: see declaration of 'QList<TextEditor::QuickFixOperation::Ptr>::toVector'
src/corelib/tools/qlist.h(423): warning C4661: 'QSet<T> QList<T>::toSet(void) const': no suitable definition provided for explicit template instantiation request
src/corelib/tools/qlist.h(390): note: see declaration of 'QList<TextEditor::QuickFixOperation::Ptr>::toSet'
src/corelib/tools/qlist.h(423): warning C4661: 'QList<TextEditor::QuickFixOperation::Ptr> QList<TextEditor::QuickFixOperation::Ptr>::fromVector(const QVector<T> &)': no suitable definition provided for explicit template instantiation request
...

Task-number: QTBUG-57086
Change-Id: I879511656c39eb7a3eae54ea7daca3eca8ebe8d7
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-11-18 11:47:59 +00:00
David Schulz f8c86fd95f Debugger: Detect msvc virtual function pointer table
Change-Id: I51d82b692638932e35f22a5bb9286eecad577ed7
Reviewed-by: hjk <hjk@qt.io>
2016-11-18 11:41:36 +00:00
hjk a8697e4716 Debugger: Don't accumulate return value displays
This fixes a regression introduced with d771ba89.

Change-Id: Icc44ef9ad41f9e5cdb3848fae7a1ba8af2626344
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-11-18 11:14:49 +00:00
hjk c9067ff28c Debugger: Fix boost::unordered_set dumper for older boost versions
Somewhere between 1.48 and 1.58 structure layout changed.

Change-Id: Id8bcb473f364537342261dd2596f9f1bdacb5c79
Reviewed-by: hjk <hjk@qt.io>
2016-11-18 08:21:05 +00:00
hjk 952c3e3b64 Debugger: Remove some of the inferior call in QVariant dumper
Change-Id: I1f1ac5c5ba59c36d3c3d6546b24a93d1b647f88a
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-11-18 08:02:35 +00:00
Christian Stenger 1eafa1540e Debugger: Lower kit restrictions for debugging
In some cases it can be useful to be able to debug although not
having a complete functional kit present. (e.g. debugging a
core file having an ABI for which you have a debugger but having
no respective compiler)

Change-Id: Ia2567c8e2dd6783e612802cc08f7767399aaf33f
Reviewed-by: hjk <hjk@qt.io>
2016-11-18 07:12:51 +00:00
hjk 61b408d110 Debugger: Force flushing of GDB output
... after continue and step. Otherwise there would be no reaction
after the inferior gets an external SIGKILL while stopped.

Task-number: QTCREATORBUG-17280
Change-Id: I57933e92194a3320d7aba81055755477f34af382
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-11-18 07:07:39 +00:00
David Schulz eabccbdcb2 Debugger: Don't encapsulate integer in values for template args
Change-Id: Ib1bb2b01ff8eb1ed11c0f5785f3b4bb5f50c411a
Reviewed-by: hjk <hjk@qt.io>
2016-11-18 06:16:04 +00:00
Thiago Macieira 6a061b2a35 Add QDataStream operator<< and >> for Utf8StringVector
It's just a QVector, but let's be explicit.

Change-Id: Ic46ff326a6ba46bc877cfffd148325c9c1354fa5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-11-17 22:38:06 +00:00
Nikolai Kosjar da54b1e6a9 Clang: Tests: Fix compilation
refactoringclient-test.cpp:126:76: error: no matching function for call to
'ClangRefactoring::RefactoringCompilerOptionsBuilder::build(CppTools::ProjectPart*,
CppTools::ProjectFile::Kind&)'

Broke with:

    commit 36d4d01cd3
    Clang: Take precompiled headers into account when parsing source files

Change-Id: I7c5a2edec0859584ea2b33e144178060788cd4d9
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2016-11-17 15:35:22 +00:00
Marco Bubke 89b3d53b27 Utils: Improve print function for SmallStringVector
Change-Id: I9dc66ddddf380d8e2af057719005f4d14a592396
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-17 15:07:55 +00:00
Marco Bubke f11b746e60 Utils: Improve debug output of SmallString
Change-Id: I738ac9d139271b7d154dd39f30ae3c08b5e5b921
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-17 15:06:58 +00:00
Marco Bubke 19a00f418f Utils: Add const reverse iterators to SmallString
Change-Id: Iefd9d6abafbe38dcb7d3ed9ea200ac3244902433
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-17 15:06:46 +00:00
Marco Bubke 8a16151601 UnitTests: Add QByteArray printer
Change-Id: I1461db8b5337e6e6aa387edc4da72ca3379d8b73
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-17 15:06:31 +00:00
hjk 572ba812d2 Debugger: Fix over-quoting in LLDB breakpoint reporting
The 'output' bit is inserted at report time, not at callback
script generation time.

Change-Id: Ibb5c9b09d8391d1be86b8f110e32ab1c90f6bab2
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-11-17 14:47:16 +00:00
Tobias Hunger 591d693d0d CMake: Move code to read CMakeCache.txt into CMakeItem class
Change-Id: Ie5d76a2b50007c80d68b2e97d3339a582afce469
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-17 13:10:47 +00:00
Jarek Kobus 77c3cbd4f0 Fix updating ui resources after creating new form
Before we have tried to update resources, however
it was done too early and ui file, which
has been created, was not inserted to any project yet.
We were connected to ProjectTree::filesAdded signal
and apparently whenever it is sent the added ui file
is still not inserted to the project, thought
the signal informs about that fact.

Now we connect to every project's fileListChanged() signal instead.

Task-number: QTCREATORBUG-15560
Change-Id: I11883a0d87fdc7c46897cef68466c1038dbaefb8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-17 13:05:14 +00:00
hjk 0334438b40 Debugger: Use more direct access in std::deque dumper
This effectively fixes the LLDB dumper for std::deque and std::stack by
avoiding a code path in which LLDB returns wrong data (the type and
offset for the _Deque_iterator::_M_first member - surprisingly the
other three members there get reported correctly).

Change-Id: Iae1ba8b81987442ed2d486b383a145a77ce49cd7
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2016-11-17 11:07:18 +00:00
Tobias Hunger 3422e5cded CMake: Clean up more paths in server-mode
Change-Id: Ifd578cbc7516f66ad52cc13faca0ee733dbc7512
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-17 10:57:23 +00:00
Tobias Hunger a7aeec22ce CMake: Unify names for important directories in server-mode
Unify names for important directories in the project tree of
server-mode cmake projects.

Change-Id: I6354e0a1cfb71f9038d9110438622c824deedebe
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-17 10:57:16 +00:00
Thomas Hartmann 6890e4e131 QmlJSCheck: Allow Math. function in ui.qml files
The Math. function like Math.max() are quite useful
to define more complex layouts. Therefore we allow them.

Change-Id: Ia95dcbcc1b8e96c117650dc8643da4a9de0ecdba
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2016-11-17 10:34:56 +00:00
Thomas Hartmann 85d288e3c3 QmlDesigner: Disable disk cache in puppet
The disk cache time stamp is only accurate up to a second
and there might be .qmlc files from the actual application.

Change-Id: I6ec9cfdda8eb7aba5a630ac577d2cef999a8132c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-17 10:34:20 +00:00
Jarek Kobus fd460a11dc Add some missing consts
Change-Id: I1c5122b893e7255237310562fcad16bc53f15fd7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-17 10:31:27 +00:00
Jarek Kobus 8c36249ffa Add missing overrides
Change-Id: I7e27a273044542537423c8f4b9ab5235c3fabc22
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-17 10:31:18 +00:00
J-P Nurmi 1c4a5529f4 Update QQC2 imports in qt5QtQuick2-bundle.json for Qt 5.8
Change-Id: I275ec57ecefaee8dc08981ad7eb57c40e47889ce
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-16 16:15:16 +00:00
hjk 84417cc122 Debugger: Use more direct access to QFile object guts
This still does not solve the QFile dumper test fail with LLDB/Linux,
but its one obstactle less. The remaining one is LLDB not reporting
the QFile base object size at all.

Change-Id: I3144cf9469c4456d21b8c220c9df1cd890348491
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-11-16 15:12:13 +00:00
Eike Ziller 4026864f38 Merge remote-tracking branch 'origin/4.2'
Conflicts:
	src/plugins/clangrefactoring/refactoringengine.cpp
	src/tools/clangrefactoringbackend/source/symbolfinder.cpp

Change-Id: I7c1c87f3b8ade43a07f6668565501042e967fa8b
2016-11-16 16:04:59 +01:00