Commit Graph

46254 Commits

Author SHA1 Message Date
Marco Benelli
78944e60ba QmlJs: handle the undefined version in module lookup.
The module lookup used to not consider the undefined version (-1.-1) a
valid version number.  This caused QtCreator to crash because of a
failing assertion.  This patch makes the assertion more permissive and
handle the lookup of an undefined version by substituting it with an
empty string.

Task-number: QTCREATORBUG-16220
Change-Id: Iac574cfc04b4718b0d0809352e5c9456e4392e83
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-13 07:02:04 +00:00
hjk
60f092f6bb Debugger: Cosmetics
Qt 5 connects, unused declaration, QLatin1Strings, ...

Change-Id: If09929993d750907ee3f4e2fa9f18acfcc28d9c1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-12 15:08:16 +00:00
Christian Stenger
3b83b8b989 AutoTest: Fix compile
Change-Id: I5d82491f77459227feaa46475e796592b6e3af89
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2016-05-12 13:58:24 +00:00
Christian Stenger
87a6f003e9 AutoTest: Split off TestResult...
...to avoid dragging around members that are not used in sub-classes.

Change-Id: I3e30b403491b1ae9219a0b461c3034cb854701a6
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-12 13:49:00 +00:00
Christian Stenger
b58a10dfff AutoTest: Split off TestParseResult...
...to allow different approaches for different test frameworks.

Change-Id: I16f101fb3f702a0db00cffe33e0d83cd4ea28c99
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-12 13:48:43 +00:00
Christian Stenger
db71490b1e AutoTest: Use (shared) pointer for parse results
This is necessary later on as we will need different sub-classes of
TestParseResult to support different test frameworks.
This avoids the necessarity to put all information inside a single
object even if it is not used.

Change-Id: I39c74ba06b9337608ece8b113b0993c0934b24b9
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-12 13:48:29 +00:00
David Schulz
06c53d8def CppEditor: Add auto completer test.
Change-Id: I21ab7e3754ab0801fb8219a1c92cd4b526cd618e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-12 13:41:35 +00:00
Christian Stenger
842ab2a551 AutoTest: Move functionality from model to item classes
Another preparation for having a consistent interface later on.

Change-Id: I573e45101016048de916f4d321b326a24efbe4ee
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-12 13:31:22 +00:00
Tobias Hunger
82b6d728c7 CMake: Fix Clear Cache when builddir is not persistent yet.
Change-Id: I4dc2c5889845b13ebe167b89e78b104f8805a1f6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-12 13:10:02 +00:00
David Schulz
cdf16ced62 Project: Fix MSVC toolchain environment detection.
Task-number: QTCREATORBUG-16250
Change-Id: Idc56e2f293459daa0ff201cbba0160afd398eebf
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-12 13:09:53 +00:00
Christian Stenger
53770ebaa5 Squish: Add some verbosity to figure out what might be wrong
tst_HELP02 is consistently failing if running from inside Jenkins,
but passes when executed locally.

Change-Id: I70fe9b7dc74dbf82f102b5670ddf04bf0dbfa270
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-12 12:40:49 +00:00
hjk
dd5e145d34 Debugger: Expose mainWindow to other plugins
Needed by GammaRay integration when merging the modes.

Change-Id: I21ee65c55e242238ab0be244c4bb40f1c9c7924e
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-12 12:33:12 +00:00
hjk
dee7ad3806 TreeModel: Rework tree iteration
Use function objects to apply directly during a depth-first
walk of the tree instead of faking a flat container of tree
nodes. Less code, and allows even some non-const operations.

Change-Id: I804ab11df358fe937b40809cbcb772e6f3ff8dc5
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-12 12:30:36 +00:00
hjk
0ce54ce1e4 Debugger: Guard QObject property extraction against failures
Nowadays, the [property] section contains only "top level" properties,
inherited ones are available through by expanding the base class.

Task-number: QTCREATORBUG-15798
Change-Id: I40475500a2d20f27145a47fa7ed1e61d4a592c10
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-12 11:25:04 +00:00
Eike Ziller
aa2e135379 Fix initial directory of file system locator filter
Broke with 08f807a134

Task-number: QTCREATORBUG-16242
Change-Id: If630e37d546815cb1347d51d3c2af5f4033e47bd
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-12 08:33:44 +00:00
Alessandro Portale
338d0ceab1 ProjectExplorer: Use a better "Cancel build" icon in the menu
Change-Id: I442a76a7a4e98b358ac3714eef8e60d482a6e39b
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-11 14:05:46 +00:00
Eike Ziller
8a8d4354df More change log
Change-Id: I09b0096cc911adb4d9f81865216194b8ddb1a73c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-05-11 13:42:14 +00:00
David Schulz
595cc6e310 LLDB: Quote environment variable assignment.
Change-Id: Ie93d251ba120fd33ab3ab12e243ff1e1818ba46b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-11 11:58:48 +00:00
Eike Ziller
13d473247f Version bump
Change-Id: I0c5d80719ae8ca134e1be32e48618b5a9043be09
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-11 11:32:49 +00:00
Eike Ziller
3d751dcf44 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	share/qtcreator/debugger/creatortypes.py
	src/plugins/beautifier/clangformat/clangformat.cpp

Change-Id: I1ab281c190767ced8a6ac2c026a121ea229a36cf
2016-05-11 13:28:35 +02:00
David Schulz
3d9ef5c813 Debugger: Collect results of the map object in python 3.
map() directly returned a list in python 2.
Fixes a startup issue on windows.

Change-Id: Ib4b67ca98a74135ff108546f8d089686f7df9493
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-11 11:25:46 +00:00
David Schulz
1c3e122d43 QmlProfiler: Fix compile warning on Windows.
c:\dev\insrc\devqc\src\plugins\qmlprofiler\qmlevent.h(274): warning
C4267: '=': conversion from 'size_t' to 'quint16', possible loss of data

Change-Id: I86ab7a9b2d01a3da70dd765cb64c6e58c1044cc1
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-05-11 10:54:34 +00:00
Anatoly Stolbov
d8e38131b7 TextEditor: printPage: add const to variables
Change-Id: I38959eb95b5d37d7e4936a5644af33b645e8da9f
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-11 10:33:05 +00:00
Tobias Hunger
ddefe062c7 Fix up QProcess::waitForFinished()
waitForFinish returns false if the process is no longer running at
the time of the call. Handle that throughout the codebase.

Change-Id: Ia7194095454e82efbd4eb88f2d55926bdd09e094
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-11 10:04:38 +00:00
Orgad Shaneh
b57a35ab55 Botan: Fix compilation with MSVC2013
noexcept is not supported.

Change-Id: Iee6f80a3e99191ccc92637aea42c5043d4f2d212
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-11 09:34:09 +00:00
Christian Stenger
ea520e3f97 Valgrind: Avoid crash when changing filter
Change-Id: Ie7b0965b21a9fde05009cc649289323cba392b63
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-11 08:09:39 +00:00
Ulf Hermann
1a248b1b93 Valgrind: Remove factories from object pool when destroying them
Otherwise we get crashes on exit.

Change-Id: I806f374ba8f835c9e4361599aa901cfc4b2f0720
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-11 08:00:53 +00:00
hjk
2813aed0ce Debugger: Add a QArrayData dumper
Helpful when inspecting staticMetaObjects.

Change-Id: I32fa0797625a675a7bad7f470ed51232734de826
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-11 07:25:04 +00:00
hjk
03ad75ef80 Debugger: Add dumper for Qt Creator's Core::GeneratedFile type
Useful for debugging 'New Project' type wizards.

Change-Id: Icabb4610e34a876b814965ed2b0d3017b5352878
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-11 07:24:56 +00:00
Takumi ASAKI
83d958ae4e Beautifier: tr()-Fixes
Do not use QObject::tr().

Change-Id: Ib77f78ead649bcfee326fb9f8acde1df7784437b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-11 05:41:04 +00:00
Adam Strzelecki
d9d3d86ad2 Beautifier: Fix clang-format file style regression
Commit 3310fbc8f2 introduced regression replacing
-assume-filename=%file with -assume-filename=%filename, that caused only file
name part to be passed to clang-format, not whole path to the buffer.
Effectively when formatting the buffer with style set to "File", clang-format
was unable to determine related style file placement (eg. within the project
tree) anymore.

This reverts back to use %file, not %filename, making clang-format "File" style
work again as expected.

Change-Id: I5e7ae3d1186b1e7c33dc89a7d60aacc0f0671e51
Reviewed-by: Lorenz Haas <lorenz.haas@histomatics.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-11 05:08:11 +00:00
Ulf Hermann
bb7925b4ef QmlProfiler: Add data stream operators for QmlEvent
We try to further compress the QML events when saving as we can use the
additional space in that case.

Change-Id: Ida308963685169d1daabd7936612628fd4d265ae
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-05-10 16:45:02 +00:00
Ulf Hermann
ca5d9659e1 QmlProfiler: Provide stream operators for QmlEventType and QmlNote
This is the foundation for a new file format.

Change-Id: Ib5ae5bfe8b45d9dc654b443ab700186993c3bfc9
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-10 16:44:58 +00:00
Ulf Hermann
943fc80f51 QmlProfiler: rename qmlprofilereventlocation.h to qmleventlocation.h
This way the file name matches the class name.

Change-Id: I6e65b0ea13a7e5b15d4c7e5ad7738fc03e3401ad
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-05-10 16:44:53 +00:00
Ulf Hermann
6aaa2aea35 QmlProfiler: Add some Q_DECLARE_METATYPE
Change-Id: If09ce20e997087ff73eb60bb16ef2e501280944d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-05-10 16:44:48 +00:00
Christian Stenger
e4b2842bf8 QmlDesigner: Fix compile with Qt5.5
Change-Id: Ib1ec04cb9baf4d936d73ceb0d80268aad882368b
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-10 15:27:32 +00:00
Tim Jenssen
221f59e152 QmlDesigner: modernize code
- no behavior changes
 - moved a slot to a lambda
 - Using QPointer instead of raw pointer to trigger
   assert if dangling pointer is accessed.
   Refactoring the code might accidentally trigger a
   delete of the QWidget.

Change-Id: Idf711da92e13cf81dd718ae9e034bca7f6d26220
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-05-10 13:04:15 +00:00
Tim Jenssen
cacdcf7160 QmlDesigner: improve warning widget code
- the "move" code needs to be inside the warning widget,
   this also fixes the problem of wrong position at startup
 - the patch removes knowledge about the DesignModeWidget and
   uses a signal

Change-Id: I9a861ab955d16e85d7af36f1b56ddb82578b8da4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-05-10 13:04:04 +00:00
Tim Jenssen
62e3c0dbf4 QmlDesigner: move RewriterError to an extra file
Change-Id: I453b30f45e0bc447b05694eadda60d4613e88062
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-05-10 13:03:57 +00:00
Ulf Hermann
71e8c3ffd7 QmlProfiler: Reset the zoom control only when we're finished loading
Drop the timeChanged signal of QmlProfilerTraceTime, too, as that
doesn't serve a purpose anymore. We don't want intermittent changes
of the trace time to be reflected in the UI when loading.

Change-Id: I85f18b90fc404ec254c68625104d3e3f9077a1d9
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-10 12:33:25 +00:00
Ulf Hermann
21caa59292 QmlProfiler: Make QmlEvent Q_MOVABLE_TYPE
Change-Id: I7a6e9909e537f1bb0bf8dcecb6c85012bac4d1e8
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-10 12:25:47 +00:00
Christian Kandeler
1239245f57 Botan: Add missing noexcept specification.
Change-Id: I0f40b31e54cfe26703256114c3c0409a28b47160
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-10 11:42:59 +00:00
hjk
d02919d850 Valgrind: Split MemCheck and CallGrind factories
The tools are separated everywhere, lumping them into the same
RunControlFactory removes modularity artificially.

Change-Id: I8d9e917bb114a1898a0c293f18d3bf78a52075aa
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-10 10:19:09 +00:00
Robert Loehning
494f4a7742 Git: Use numerous form
Change-Id: I5a5f8cc4f607f0dd80772eb97128bdefa753c201
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-05-10 09:32:15 +00:00
Ulf Hermann
26659b48ba Timeline: Drop TimelineItemsGeometry::allocatedVertices
Change-Id: Ibb4757cb159856c81c0c7f5f6a8138a61899b06f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-05-09 16:33:47 +00:00
Eike Ziller
9e66ce48e4 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/plugins/autotest/testcodeparser.cpp
	src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri
	tests/unit/unittest/unittest.pro

Change-Id: I9db4fbea6ea7c9fdd0d8e1703735af20c92e754b
2016-05-09 16:37:41 +02:00
Oswald Buddenhagen
605ea627cc don't add system paths to INCLUDEPATH
Task-number: QTCREATORBUG-16217
Change-Id: Ib88db8cc27d44834997e96d91e3bca8824e81f9b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
v4.0.0
2016-05-09 13:11:50 +00:00
hjk
3d34ccf4d9 Debugger: Enforce use of target-async for Android gdbserver
Since NDK r11 this seems to be needed to get breakpoints set
correctly on Linux and Mac.

Change-Id: I54281feecc0a915d4761228c612b72889756aecf
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-09 12:47:59 +00:00
Ulf Hermann
f63d64330e QmlProfiler: Avoid zero-sized arrays
Change-Id: Ia17d067ed677cd3a63d8a478ecb9abec91032771
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-09 11:25:29 +00:00
Eike Ziller
043218971f OS X: Use UTIs for the various supported file formats
That also enables text preview in Quick Look. Also adds missing items
for .qdoc and .qdocconf files.

Change-Id: I5c3f62aceba9a5d31478d083a9ea0adb2ffbcac1
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-05-09 11:05:11 +00:00