Commit Graph

3169 Commits

Author SHA1 Message Date
Alessandro Portale
b1176b97dd New Qt Creator logo
Change-Id: If00ef246081b72d4f5cc64efb529461c53fb0d23
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-10-09 15:43:28 +02:00
Nikolai Kosjar
c2e5f1c819 C++: Pass on the byte offsets of macro arguments
...to the Document/Block.

Change-Id: I1a96dc70ac93254e6030326b36a5df9a2cdc2bd8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-10-08 09:51:17 +02:00
Ulf Hermann
dbb4e761ef QmlProfiler: Update abstracttimelinemodel test
height() needs a modelmanager now and rowCount() is centralized.

Change-Id: I7fc1833d4bb5de4df99bed0e43f1da836e45df21
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29 14:26:55 +02:00
Eike Ziller
d008779bf7 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I6dffc1925e6bf35cf6e9fe0676c11d1a5143a208
2014-09-29 13:40:53 +02:00
Ulf Hermann
38f4d6a5f2 QmlProfiler: rename "eventId" fields to "typeId" and "selectionId"
The convention is now that selections are the rows in the expanded
timeline, "types" are the types in the QmlProfilerDataModel, and
events are the single boxes in the timeline. Thus, the event view
shows only types and for consistency the V8 view does so, too.

Having eventId as synonym for "type index" and "event index" as
actual index into the list of events is confusing.

Change-Id: I6b7c4c3f1ab0a8b71c511de52ab296a2e91cf5f0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29 13:06:45 +02:00
Christian Stenger
02c260e6ca Tests: Fix compile
Introduced with 953cdb971f

Change-Id: I9d69cfcff1778e8428a6da18fc300d8aaaac2904
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-26 16:12:03 +02:00
Robert Loehning
bacf4f0afb Squish: Do not crash tst_simple_debug if debugger can't stop
Change-Id: Iedf0335088739ed60f321b6479711298067f9038
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-26 15:42:30 +02:00
hjk
bc111ef37a Debugger: Only auto test dumper for boost >= 1.54
Change-Id: Ib8d0f2c6ed0323eb969c6a6eed9ea0a6c0e3cf8e
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-26 13:47:18 +02:00
hjk
953cdb971f TextEditor: More BaseText* -> Text* renamings
*Document* and *Layout* classes, all basetext* files

Change-Id: I1c6e376733a434fcb5c7f19c6210dfa031eeafde
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-26 10:12:51 +02:00
hjk
bf5f14a4e1 Debugger: Fix QHash display of "compact" keys
Add make std::string usable as "compact" key.

Change-Id: Idbfcf9d299e2dde392025166a20c3d0ab60239a6
(cherry picked from commit 2776536a7e)
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-26 09:35:36 +02:00
hjk
9402ab1d47 Debugger: Disable boost_unordered autotest for gdb < 7.6
Change-Id: I67e63892ff997312fb23f421b0eabaf9bc1eb4aa
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-26 08:52:02 +02:00
Robert Loehning
a4321bbfe1 Squish: Run tst_memberoperator with Clang code model, too
Change-Id: I3b4b2ed3523e94d5a6dee6957b5b16d4092122fd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-25 16:09:12 +02:00
Robert Loehning
ea93a6531c Squish: Run tst_CSUP05 with Clang code model, too
Change-Id: Ief81ba27d8cbd43de5ef9c71b586da8cc372a8bb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-25 16:03:20 +02:00
Robert Loehning
6447eb9cbf Squish: Run tst_CSUP04 with Clang code model, too
Change-Id: I3a2f029e0f1c85ecbd3c161b097f4e975014f714
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-25 16:02:38 +02:00
Robert Loehning
4957137ef6 Squish: Run tst_CSUP03 with Clang code model, too
Change-Id: I5b240b2fbd7999b2228871ddf8faa72509c49465
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-25 16:01:54 +02:00
Robert Loehning
4d8002a973 Squish: Add shared file for clang-related code
Change-Id: I2eaa39afbfeb0031f191ce9adead80c0d0960542
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-25 16:00:50 +02:00
Nikolai Kosjar
4da91bef8d C++: Fix endless loop in lookup on Windows
...for templates with typedefs referencing the respectively other
template (basic_ostream <-> ostreambuf_iterator).

Tested with MSVC 2013.

Regression introduced by ba42ceb0cb.

Task-number: QTCREATORBUG-13064
Task-number: QTCREATORBUG-13065
Change-Id: I71a45c720663a73c3302eb7da731e6ad2d8f0fbd
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-09-25 11:35:47 +02:00
Nikolai Kosjar
c9f309f9be C++: Tests: Extract some functions in tst_checksymbols
...so we can use them in a follow-up change.

Change-Id: I0ddc5bb966e72ab5c527f6814650d70492bbbdb5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-25 11:29:23 +02:00
Eike Ziller
d6c73653ed Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
	src/plugins/texteditor/basetexteditor.h

Change-Id: I556a7661872b90b329a46694e335e18cddc28677
2014-09-23 10:10:09 +02:00
Christian Stenger
149f420550 Squish: Fix tst_tasks_handling
Change-Id: I58a818864b495d1ecf2923abd50cf848ba368195
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-09-23 07:16:58 +02:00
Robert Loehning
741ab6b732 Squish: Fix NewDialog
When called from Welcome mode, the windowTitle is "New Project".

Change-Id: I12f013cf5a5c8d4d2ec1115e4f29f12cadf99676
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-19 11:11:32 +02:00
Robert Loehning
dd1bc1f607 Squish: Avoid crash of tst_CSUP06
Change-Id: I76318223443ec2e0cc8ddd887a8ac70a6993c0c4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-19 11:05:13 +02:00
Christian Stenger
ca6a766314 Squish: Clean up
Change-Id: I4cfde0c332b08e8b0beac8089fbdb641b09a4a05
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-09-18 12:16:52 +02:00
Robert Loehning
4c45e43916 Squish: Updates to keep suite_tools running
Change-Id: Idb7a4c70c26aaf105ba2023d126fbc0f9f992e9e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-18 11:01:05 +02:00
Robert Loehning
98c3a1c331 Squish: Update getEditorForFileSuffix()
Change-Id: Ib052d2dd655117492cbb26f03eaa63c8b61466bb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-18 11:00:40 +02:00
Robert Loehning
f2b5f6a8eb Squish: Updates to keep suite_debugger running
Change-Id: I3096289a935b654005cdc7440a87cbc527410c64
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-17 16:45:04 +02:00
hjk
22a4f49153 Debugger: Require Qt 5.2 for manual test, too
... by removing fall-back code.

Change-Id: I71f3ece335ef660e62e93dcbbeff18dc5b0c46f0
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-17 14:42:34 +02:00
Eike Ziller
914adeab82 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
2014-09-16 15:17:21 +02:00
Oswald Buddenhagen
62da66a0aa AbstractMacroExpander: expand macros recursively
Started-by: Tobias Hunger <tobias.hunger@digia.com>
Change-Id: Id2e88efbb475221cd7c0347f7d5e7009e4372eec
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 17:13:57 +02:00
Nikita Baryshnikov
f90f4ffdd3 Compile fix for tst_abstracttimelinemodel
Implemented pure virtual methods features, loadData with protected
access modifier

Change-Id: I75b0c0ed1f56a06a401d69f538462367de442d88
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
2014-09-15 13:33:19 +02:00
Oswald Buddenhagen
3e4f17c164 remove pointless uses of OTHER_FILES
these cases are automatically covered by other variables

Change-Id: Ic32411fa361346633d3127be063fcaabc9ef7c28
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-15 12:51:02 +02:00
Oswald Buddenhagen
ca492c8fac use DISTFILES instead of OTHER_FILES in creator's own build system
it's the correct variable to use.

Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-15 12:10:01 +02:00
Ulf Hermann
2b362de064 QmlProfiler: introduce properties for empty, hidden and displayName
Like this we can properly refer to them from QML.

Change-Id: I98378d543d307f78909191225e72c9d0404dfa1d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:15:52 +02:00
Ulf Hermann
5799901bcc QmlProfiler: Protect AbstractTimelineModel's loadData() and clear()
They really shouldn't be called from outside. We'll introduce an
"empty" property whose notify signal will depend on data handling to be
done in a controlled way.

Change-Id: I272eaa3638ba571d9f9ffd964b0d33449d0adda1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:15:43 +02:00
hjk
2776536a7e Debugger: Fix QHash display of "compact" keys
Add make std::string usable as "compact" key.

Change-Id: Idbfcf9d299e2dde392025166a20c3d0ab60239a6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-12 15:36:01 +02:00
Tobias Hunger
0ed377466c AbstractMacroExpander: Allow escaping of %{Macros}
Use "%{}" to put a literal "%" into the output of the macro expander.
E.g. "%{}{Macro}" will be turned into "%{Macro}"

Change-Id: I592789e5cd8f2d52df424db679baf7ba04723202
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-09-12 11:28:48 +02:00
Christian Kandeler
f511344ed0 SSH: Fix tunnel test.
Since we're opening the port for IPv4, we must also use an IPv4 host
address.

Change-Id: I73e009ebd6deb0bd6804cddc8c83299dbfc1b312
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-09-11 13:19:56 +02:00
Christian Kandeler
67d18670a3 SSH: Adapt test to signal renaming.
This was overlooked in the original patch.

Change-Id: I1709e28552ed9dd83bd3e810ba51ef5ec95d8580
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-09-11 12:52:41 +02:00
Ulf Hermann
2677e33782 QmlProfiler: rename relative height of timeline items to "relativeHeight"
This clarifies that the item height is not absolute but relative to the
row height, and it reduces the ambiguity of the various "height" methods.

Change-Id: I391441147c88b47a14e539fc3853702bb517d27b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-10 15:43:00 +02:00
Thomas Hartmann
79c0a29dea QmlDesigner: Adding a manual test for plugin integration
Because we had a couple of regressions in this area, I add this project
for manual testing.
In this project we have a qmlproject with a plugin that contains a .metainfo
file and a custom property sheet.

We define two items in the item library: MyComponent and MyComponent2.
While MyComponent has a custom property sheet the property sheet for
MyComponent2 is auto generated.

Change-Id: I8d5ade43f648354175587c0a3e989bad87149298
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-09 16:54:10 +02:00
Christian Kandeler
847f10e9cc Remove Qt version checks.
Qt 5.3 is the minimum requirement these days. Remove all fallback code
from sources and project files.

Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-08 10:33:25 +02:00
Robert Loehning
fdfb9338b6 Squish: Stabilize tst_CSUP06
Change-Id: I68071a5e8964c89a61a4dfe310fdbd7bb5fd1b8a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-05 13:00:12 +02:00
Robert Loehning
1f3d7c9e61 Squish: Include new Qt Quick templates
Change-Id: I92e359d95bc9cd62b5e1b8a059cb8aef3908bcb4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-05 12:27:12 +02:00
Christian Stenger
690153786e Squish: Provide test for ClangCodeModel plugin
Change-Id: I4bf45cf838baa89b558292ca9d08ec184e80c20d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-09-04 07:24:55 +02:00
Eike Ziller
49db3a450a Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/remotelinux/remotelinuxdebugsupport.cpp
	src/plugins/texteditor/basetexteditor.cpp

Change-Id: I0da7c1cf2506b12d0563795aa8177fc45e97050f
2014-09-03 16:08:02 +02:00
Robert Loehning
0f253e48bf Squish: Continue testing other files after fatal error
Change-Id: I2e8709a84882dde5a6bc96b4bd213581175c6c8c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-02 16:54:54 +02:00
Nikita Baryshnikov
cae737e629 Fix private_headers.pri inclusion in tests
Change-Id: Iec8aa54e04b7783b32a2db41ab870cccbadf983e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-02 15:52:35 +02:00
Eike Ziller
b5b6a46b4e ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files
Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-02 15:11:24 +02:00
Robert Loehning
7854dd33d9 Squish: Test opening of QBS project
Change-Id: I980ad15147f419b2d42d86b2a62ebf2875a3c2d8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-01 15:23:03 +02:00
hjk
389d64ec33 Debugger: Disable some boost usage in autotest
Breaks some setups and is not that important anyway.

Change-Id: Ic5d324445c2a2f12a7f6c2a4b52b51e3a2567c95
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-08-29 16:40:02 +02:00