Commit Graph

4400 Commits

Author SHA1 Message Date
Erik Verbruggen
242b3f4110 C++: clean up numeric literal parsing and add support for n3472.
Separate the messy pp-number parsing from the numeric literal parsing.
The C/C++ preprocessor makes a grown man cry, but at least we have
"proper" literal parsing when we want it, including C++1y binary
literals.

Next step is digit separators (n3781).

Change-Id: Ia069eef454ed5c056f77694a5b8a595d0b76adc4
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2014-12-18 15:46:22 +01:00
Ulf Hermann
dac7e8644e Timeline: test TimelineAbstractRenderer
Change-Id: I9860af4b6aedbd656103bf5def38f1830b1352e1
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-18 13:04:28 +01:00
Ulf Hermann
f0da74d35d Timeline: Streamline model implementations
Allow models to be created without a parent and provide default
implementations for virtual methods. It's actually fine to have all
ranges in row 0 and in black by default. Having default implementations
makes things easier to test.

Change-Id: Ibb842ef295cdcfa13d8ca4be3489906af72e9699
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-18 13:04:09 +01:00
Ulf Hermann
7053378fdf Timeline: Complete test coverage of TimelineModel.
Change-Id: If27c51b1189bc0bb0333837c58849bc79b779845
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-18 13:03:38 +01:00
Ulf Hermann
c40d9e9d17 Timeline: Create new library from contents of QmlProfiler
Change-Id: I964b2f149e237eb25a08600e8dab8968e8bc0cb9
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-16 15:22:48 +01:00
Christian Stenger
f515a2528e Squish: Enable QmlProjectManager plugin for tst_qtquick_creation3
Change-Id: Idaa2a603f5945a4df249f9b6ce606769a5c7ea74
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2014-12-16 07:19:39 +01:00
Nikita Baryshnikov
464cd2df71 Test TimeLineModel fix compilation
after 516c0d6020

Change-Id: I2d2cdf0c899946f9bb792db2a10c12b03dfef4bc
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2014-12-15 16:27:06 +01:00
Robert Loehning
1be459d9dc Squish: Avoid error in tst_build_speedcrunch
Change-Id: I2f199f392016005b8e00e48253838370628875d9
Task-number: QTCREATORBUG-13700
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-12-15 16:25:04 +01:00
Nikolai Kosjar
e3977de08e C++: Finish gcc's include_next support
This implements the actual include_next logic and thus completes

    commit b934cc1
    C++: pass #include_next down to CppPreprocessor::tryIncludeFile

    commmit 140b502
    C++: Highlight argument to gcc's #include_next extension

Based on https://gcc.gnu.org/onlinedocs/cpp/Wrapper-Headers.html

Task-number: QTCREATORBUG-10225
Change-Id: I7eef7f5ea64a114f6d092304d32b72c55c2ce134
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2014-12-15 15:37:36 +01:00
Christian Stenger
949a86f035 Squish: Fix tst_git_local
Change-Id: I6acdaaf81a0b8c2523df4fda4ee7ec044da25678
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2014-12-15 15:24:30 +01:00
hjk
8815990903 Debugger: Fix std::unordered_* dumpers with GCC 4.9.1
Change-Id: I5d5ed9cfc68af061970b0055b76cb563ca04ee53
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-12-12 13:54:37 +01:00
Eike Ziller
541d00453a Merge remote-tracking branch 'origin/3.3'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp
	src/shared/qbs

Change-Id: I6d91042bb48314d00be721099aed19feca74e0ce
2014-12-10 13:20:02 +01:00
Ulf Hermann
725623583f QmlProfiler: Separate expanded and collapsed row heights and counts
We'll need to access both of them when building the scene graph. This
change also clarifies the dynamics between expanding categories and
row heights and offsets.

Change-Id: I2e2bf488ad973c95d05f230bf6fff63598f39bf2
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-12-05 14:15:15 +01:00
Robert Loehning
5ff6bbd4cd Squish: Test auto variables in tst_memberoperator
Change-Id: I7b5bbdcfbd685abb5a716cc237276761065eb962
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-12-05 11:17:40 +01:00
Christian Stenger
64d6d64c93 Squish: Let test continue instead of crashing on protocol error
Change-Id: I3c862d26fbbdf124c0b347225cfd97e0748a0830
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2014-12-03 12:09:29 +01:00
Eike Ziller
d341c48246 Merge remote-tracking branch 'origin/3.3' 2014-12-01 15:44:30 +01:00
hjk
8fdce7cdac Debugger: Disable QVariant(KeySequence) dumper for LLDB
This triggers errors in LLDB
  error: main.o Parsing a die that is being parsed die:
      0x00001ddf: DW_TAG_subprogram operator void *QMetaObject::Connection::*
  error: main.o Parsing a die that is being parsed die:
      0x000100fa: DW_TAG_subprogram operator QObjectData *QScopedPointer<QObjectData, QScopedPointerDeleter<QObjectData> >::*

Change-Id: Iae6a8ca1fbd84c43c7d31b65e017792d1b6a1e0b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-12-01 12:03:17 +01:00
hjk
bf9a3b2020 Debugger: Fix LLDB reference display for LLDB 320.x
There is seemingly still no proper API for that, and
the old hack broke. Use a new one.

Change-Id: I9e638ca1fbd84c43c7d31b65e017792d1b6a1e0b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-28 14:55:03 +01:00
Nikolai Kosjar
2fc4acbc35 CppEditor: Avoid duplicate "Add #include XYZ"
Task-number: QTCREATORBUG-13422
Change-Id: I3648bf44760fdac4e8e1e79652519136af6032c8
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2014-11-28 14:01:10 +01:00
hjk
315fb0372e Debugger: Add more reference related autotests
Change-Id: Iae638ca1fbd84c43c7d31b65e017792d1b6a1e0b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-28 12:48:28 +01:00
hjk
9f272bcb8c Debugger: Also output dumper location in LLDB auto test
Change-Id: I51a017ced91198bdc4e822cfcc1c45580945a773
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-27 07:09:34 +01:00
Eike Ziller
938326ef2c Merge remote-tracking branch 'origin/3.3' 2014-11-26 11:11:46 +01:00
hjk
42fc31bff7 Debugger: Require some clang version for clang specific test
Change-Id: Ib6ba0ffb5957a60e700abd9a540bd7bbf5888b2a
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-25 13:02:24 +01:00
Eike Ziller
a47fbb8309 Merge remote-tracking branch 'origin/3.3'
Conflicts:
	src/plugins/coreplugin/coreplugin.cpp
	src/plugins/coreplugin/themesettingswidget.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.h
	src/plugins/qmlprofiler/qml/Overview.js
	src/shared/qbs

Change-Id: Ibe92c166fc5bfbcb4d6964e50ca7298d8459d60e
2014-11-24 15:43:48 +01:00
hjk
1a1ec50801 Debugger: Adjust std::vector<bool> dumper autotest for recent Clang
Change-Id: I1998f0750c5905a3dc4e83db297edc135cd2a39a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-21 15:12:11 +01:00
hjk
20675704c6 Debugger: Add ability to check for clang version in tests
Change-Id: Ie56de7a0e59cadd8557f7a2fd00d434470000f3c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-21 15:12:04 +01:00
Ulf Hermann
10d942e268 QmlProfiler: Split AbstractTimelineModel in two classes
We need a general purpose TimelineModel and a specialized
QmlProfilerTimelineModel.

Change-Id: I2da02d65efa11e160cab5fa9f8a21075beb0e2bf
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-21 14:03:58 +01:00
Ulf Hermann
af84726c51 QmlProfiler: fix autotest
Change-Id: Ibe5e7638eb7f3d88ed02e6de12b81c9b2aba3e7d
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-21 14:03:49 +01:00
Ulf Hermann
91cb52d40b QmlProfiler: Require model manager when constructing timeline models
This relieves us of the headaches created by figuring out what should
happen if the model manager is changed later. Extension models can be
safely created through a factory.

Change-Id: I8cf8fd6d639e4e6c9da66351ea44cfc35fd614a5
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-21 10:54:29 +01:00
Christian Stenger
dbf663198c Test: Fix valgrind auto test
Change-Id: I6ea9f4d174170b9e430ea77b2337dfdb9971c13c
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-20 12:26:18 +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
Christian Stenger
cd8dc3ae12 Tests: Fix tst_fileutils for Qt5.4+
Change-Id: I65b4eb8dff91c69bff50c63cd42a4894df0470f0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-18 14:43:22 +01:00
Robert Loehning
cddd19239d Squish: Waiting for "Cancel" button to come and go
Same concept as in progressBarWait()

Change-Id: Ic8e21663f7b0831c79e440dc4aa76237dc814e5d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-18 11:10:29 +01:00
Robert Loehning
8871f0b36b Squish: Wait even longer for indexing docs
Change-Id: I69a09389d4ecc8fefea96311ea8144dbc4f838e2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-17 13:26:42 +01:00
Robert Loehning
3c3ded74fe Squish: Wait longer for indexing docs
Seems to timeout frequently on Windows test machine.

Change-Id: I07827555d1c5044a37e708051704644995fe4b17
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-13 12:51:25 +01:00
Robert Loehning
fdb91f5135 Squish: Wait for search results consistently
Change-Id: I956bf543505c5391a78325070b72e3affc5133a6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-13 12:50:02 +01:00
Eike Ziller
2d03b59f53 Merge remote-tracking branch 'origin/3.3'
Change-Id: I0ab4982e229d475b8e3575414b4bebbfea07498d
2014-11-12 12:55:10 +01:00
Nikolai Kosjar
69504c25ca C++: Document::functionAt provides line information
Needed for the debugger.

Change-Id: I6465f6dc53017df212e403ea8a9a1c7977ac1671
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-12 12:29:51 +01:00
Nikolai Kosjar
cefd1832ce C++: Include class name for inline functions in functionAt
The code that constructed the fully qualified name used
enclosingNamespace() which skips classes.

Use LookupContext::fullyQualifiedName() instead.

Change-Id: Ic03a91c0fe120c52dc69f3e78e82a574458d8314
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-11 11:50:46 +01:00
Nikolai Kosjar
079e7a500f C++: Tests: Make document_functionAt data driven
Change-Id: I8e811b21c584e7b6a2b8eb61830cb680f6fefa95
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-11 11:23:13 +01:00
Christian Kandeler
9d677e3302 qbs build: Remove unneeded import statements.
The respective items are available without it.

Change-Id: Idc840cf08e7bec84f561c096afe8de25b1fb8468
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-11-10 15:45:14 +01:00
Christian Stenger
b5478c994c Squish: Fix tst_git_local
UI for committing files has changed.

Change-Id: I452e1e7f1bd4a976d8fb0a3a98927ddbfb372213
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2014-11-10 13:24:44 +01:00
Orgad Shaneh
e871225057 C++: Add a failing test for pp concat bug
Task-number: QTCREATORBUG-13219
Change-Id: I6278d7977f0ce560e793838c90cfbc867e1af025
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-11-07 08:52:31 +01:00
Orgad Shaneh
b4112d7806 Tests: Fix compilation
Broken by ca151d07fa.

Change-Id: Ic6b58b5749d5811d1250840c81d692837e9a2cea
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-11-07 08:18:28 +01:00
Christian Stenger
48a90eea3c Squish: Remove Squish 4 from mapping file
Change-Id: I3b81e5389462a688c6da5c2a1a0ed7a38ecc833a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-11-06 07:51:27 +01:00
Christian Stenger
023eb375ca Squish: Fix creating empty qmake project
Change-Id: I6607afde615d40a94597678665e8f30a2d6d87c6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-11-04 13:25:55 +01:00
Eike Ziller
cd5e00034d Help: Fix highlighting of search terms.
It was using the wrong search help engine to get the search terms.
Instead let the search widget itself figure out the search terms, and
pass it directly on to the help widget when activating links.

Change-Id: Ib72220eafca69e92894fe7584b1e4dfd9a42cc7e
Task-number: QTCREATORBUG-13239
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-04 07:57:08 +01:00
Robert Loehning
f44aee5da0 Debugger: Make simple test compile with old Qt and MSVC
Change-Id: Ibef0886f059a4807af9ad0e7922b37835da75efb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-03 10:56:48 +01:00
Robert Loehning
335ada73c4 Squish: Expect missing manual
Change-Id: I296d492ea79512ac73dfec4d86743b1203ee9631
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-31 14:52:12 +01:00
Robert Loehning
07a52d1ae6 Squish: Remove Qt4 compatibility code
Thank you Qt4 for all the good times we had together.
Farewell.

Change-Id: If0e81b71a97524bb0c84ea5bbcba4c29244a0a5e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-31 14:52:03 +01:00