Commit Graph

53197 Commits

Author SHA1 Message Date
Ulf Hermann
1e781cd396 QmlProfiler: Avoid empty timeline when restricting to ranges
The timeline models were suspended for editing but never restored. To
test the correct behavior a test case for the trace view is added.

Change-Id: Ic1803e9d84656eed97795f1f1674e3d56c83f650
Task-number: QTCREATORBUG-18354
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-07 11:50:19 +00:00
Christian Stenger
1643b4e7a7 Squish: Remove workaround for fixed issue
Change-Id: I7cc40e83400bcf2614ae6eb34eecefa9bb75d172
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-08-07 11:02:19 +00:00
Christian Stenger
e45f4af3d4 Squish: Work around Squish issue on macOS if necessary
Change-Id: Ib6a6179ba51a907ee5e7aa1a6e30f345da217e52
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-08-07 11:02:09 +00:00
Alessandro Portale
f752fbb5cc Wizards: Refresh the Canvas3D Application wizard
...and move it under qtquickqpplication

Change-Id: I7e402424075583fe895aaa1cb6e877351098015b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-08-07 10:25:57 +00:00
Christian Stenger
d93af8c90f Squish: Add special menu handling for macOS
When sub menus are going to get triggered the mouse
interaction done by Squish might close the sub menu
with the mouse click - avoid this by explicitly
setting the mouse cursor onto the item before
clicking it.

Change-Id: Id2afe9823304caac1bd66a423fe4a0ee12993ddd
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-08-07 10:05:53 +00:00
hjk
3d25d2d96c ProjectExplorer: Add some basic RunWorker documentation
Change-Id: I06dfdf3d20d0bd040dd96d9ebd5c0542afbde1aa
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-08-07 09:31:32 +00:00
Leena Miettinen
5d81f62f45 Qbs: Add Qbs doc output to .gitignore
So that the HTML files don't clutter Git Gui
when committing changes.

Change-Id: If415e42d3dd76274aaadce839593e8b1a4651b3b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-08-07 08:09:10 +00:00
Leena Miettinen
a8d81153e8 Doc: Reflect changes in the Projects view
These changes were already made in 4.3.

Change-Id: Ic5be8b9d24ca8f0fb7a2ab5176d312fb9f2a2251
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-08-07 08:08:51 +00:00
Christian Stenger
774bf8d8af ModelEditor: Fix compile for Qt5.6/older gcc
Change-Id: I1517a2f5ed755f4a7c93be39de805ae958868d66
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-08-07 05:36:34 +00:00
Jochen Becher
9a926e4de6 ModelEditor: Remove QStringLiteral from plugin code
Change-Id: Ia88af8340540790bb6922682166c662863ebcaa3
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-08-06 10:47:10 +00:00
Jochen Becher
2b311792c5 ModelEditor: Remove QStringLiteral from modelinglib
Change-Id: I76de9e2b97b11c2c01136a0c395447fd10698906
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-08-05 20:35:23 +00:00
Nikita Baryshnikov
a9284cd645 ModelEditor: fix coverity warnings
Change-Id: I20fd600f910bc5f869b788b665725f9a6b0ffad2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-08-05 19:35:29 +00:00
Alessandro Portale
e6bea5c3e2 Wizards: Add a Qt Quick Controls 2 "Scroll" wizard
Creates a Qt Quick Controls 2 application with a ScrollView to display.

Change-Id: I6367b8d39eea632469f62f1fc1b99790121ff00e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-08-04 14:41:23 +00:00
Tim Jenssen
836f54e3b6 Wizards: fix dynamic table size usage
Change-Id: Ia90013049cababe2e7130188892f423e3ded3e91
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-08-04 14:17:57 +00:00
Tobias Hunger
9a0562f83f Kit: Improve toolchain setup on auto-detected kit setup
The auto-detected Kit used by default in creator used to set up a
set of toolchains, that usually match up with each other (this relies
on the auto-detecion of toolchains to detect groups of compilers
in one go).

Then the Qt version selected (or better: The mkspec) will change the
C++ compiler if necessary.

Change this to actually pick a good C++ compiler and also update all
other toolchains to match the C++ compiler.

Task-number: QTCREATORBUG-18571
Change-Id: I95ddd9b83cf1642fba648919b76d3e3b7aa24c43
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-04 13:58:57 +00:00
Tobias Hunger
ea867cd49a ProjectExplorer: Add option to hide empty directories from project tree
Together with the earlier fix for hiding generated files, this change makes
for a very clean CMake server-mode project tree:-)

Change-Id: Ib70fd66699eddf5d6e602f3f8848b31fd6d85b57
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-04 13:34:13 +00:00
Tobias Hunger
e50f882f0f ProjectExplorer: Fix hiding of generated files in project tree
Change-Id: I30bb292aadd869fb3cc0791c4ad7a06b7b734703
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-04 13:34:04 +00:00
Tobias Hunger
68768d8e61 CMake: Get rid of <Source Directory> in server-mode
Change-Id: Ifa4f813d577ab64351d25eb4be1dc7981687da23
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-04 13:33:56 +00:00
Leena Miettinen
ded65d888b Doc: Fix section levels in "Checking Code Syntax"
Make the two sections that follow "Checking JSON Data Structure"
its subsections, because they are closely related to it.

Change-Id: I49d6f1098965255ae23293f086fc92dad081e390
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-08-04 13:30:26 +00:00
Christian Kandeler
e64a2fb075 Update qbs submodule
To HEAD of 1.9 branch.

Change-Id: I98ac684ce4e945934fca90f8f5eccac2f7c29802
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-08-04 12:33:38 +00:00
Alessandro Portale
090278b097 Wizards: Refresh the Qt Quick Controls 2 Application wizard
This new "Swipe" wizard is the replacement for the old
Qt Quick Controls 2 wizard.

Change-Id: I5969894888785ee27d96fa722e388cd69782fff0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-08-04 12:22:08 +00:00
Ivan Donchevskii
7671a04a26 Clang: fix regression in paren autocompletion
Limit the cases when paren is not added
after function name completion

Task-number: QTCREATORBUG-18656
Change-Id: Ibdf1e9c1d7d7b400c1c853e0bb81622e52729cfa
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-08-04 10:47:21 +00:00
Marco Bubke
4ae0c6782f Utils: Fix replace function in SmallString
You need to allocate the memory before you replace a smaller text with
a larger one. It has some overhead because you go two times over the text
but it is anyway not designed for a large text.

Change-Id: I2f56f1300a5daf9e26632b5b0667023a09ff4bd2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-04 10:33:03 +00:00
Marco Bubke
45dbc743b0 Clang: Fix formatting
Change-Id: I2181639ea0725708a005898d20b74560439d4e2c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-04 10:05:26 +00:00
Marco Bubke
793acdb9c6 Utils: Improve SmallStringView::operator==
Change-Id: I5be22e86cdeb7045386633733d2347f48a705578
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-04 10:04:43 +00:00
Marco Bubke
f6228cae22 Utils: Improve SmallString::operator<
Change-Id: I893634dd4e95b4103f0fc822e5268cc5f95d3d4b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-04 09:55:48 +00:00
Marco Bubke
a39f659b65 Clang: Remove empty line
Change-Id: Icdb54baf17f6e4f028d32b98a1bc0c945da4968e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-04 09:48:36 +00:00
Marco Bubke
d54db53d2f Utils: Fix spacing
Change-Id: I3c3f4e22ad64144f7ea92e671b9f582fd434b491
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-04 09:48:15 +00:00
Marco Bubke
4c7cc99375 Utils: Fix short string capacity
The short string capacity is the data area size minus the size of \0.

Change-Id: Iffb4428bb81fc78bdc4c00218cf9f2c9ac8c25e5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-04 09:47:59 +00:00
Marco Bubke
08711525ec Utils: Clone the capacity too
It has it's advantages if the text grows otherwise we maybe waste memory.

Change-Id: Ic76d25207c2ef18182069fbf64bc0fb955a85353
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-04 09:40:09 +00:00
Marco Bubke
4cc89b97de Utils: Don't allocate new memory if it is fitting in the short string
If you call reserve on a read only reference we always allocated on the
heap which is not that smart.

Change-Id: Ib9653c6fc87bc65716a966545c13f7ecb3712039
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-04 09:32:21 +00:00
Marco Bubke
18453deafb Utils: Cleanup SmallString::replace
Improve the naming of the variables.

Change-Id: I125f3451e0e6a7437909067e9bff06cbeac111a0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-04 09:22:04 +00:00
Marco Bubke
0e3dc045a1 Utils: Fix replace crash
The bug was that we returned the new end() but not the old reallocated
after a reallocation of the memory. The return value is used to move the
string after the found sub string to the next found sub string to the
new position of after the replaced sub string. Because the new end moved
more to the right we moved a much bigger chunk of memory. So we
accessed memory outside of the allocated memory.

Change-Id: I9ac276e201eabee896190da0cf0ee1d86860777d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-04 09:05:33 +00:00
Andre Hartmann
3480579943 Extract CamelHumpMatcher for use in the C++/QML locator filters
Started-by: David Kaspar <dkaspar@blackberry.com>
Change-Id: I928ccdc4084f8d07826746c771e7fca6994f95ab
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-08-04 08:19:10 +00:00
Nikita Baryshnikov
7729195d19 Fix warnings in ProjectExplorerSettingsPage ui
from d6591625c3

Change-Id: I35bbba0ff9ccd69f4d3474f263de85dbc8ab49ff
Reviewed-by: Samuel Gaist <samuel.gaist@edeltech.ch>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-08-04 06:36:48 +00:00
Vikas Pachdha
95d34c9277 Squish: Fix Start debugging button identification
The tooltip on start debugging button may not contain project
name and thus no trailing space

Change-Id: Ibc934770feb8b2f7d5fff553b91e3803c222bdad
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-03 12:42:44 +00:00
Christian Kandeler
8b8a32ba0e qbs build: Do not access the bundle module unconditionally
We should not rely on its presence on non-Darwin platforms.

Change-Id: I3fa722038f9c2d1139f6e1dc8c49d1c4d2fe0bee
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-08-03 11:09:55 +00:00
Nikolai Kosjar
2d27c55310 Clang: Suspend least recently used translation units
...to free some memory.

The translation units of the 7 most recently used documents ("hot
documents", tracked by document visibility) are kept in memory.
Translation units of other documents are suspended and will be resumed
once they become visible again.

The resumption of a translation unit needs the same time as reparse
(since it is a reparse effectively).

The number of hot documents can be modified by the run time environment
variable QTC_CLANG_HOT_DOCUMENTS=N. Visible documents are always hot.

Task-number: QTCREATORBUG-11640
Change-Id: I68ecd2b1373e303372300203e42d90f65a4b39b3
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-08-03 08:27:32 +00:00
Nikolai Kosjar
c2cfc62f08 Clang: Use document visibility as jobrequest conditions
This is in preparation for a follow-up change that will add jobs that
also operate on invisible documents.

Change-Id: I2a0fc3b95cc5ab2e267429134a534df64c901376
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-08-03 08:26:53 +00:00
Nikolai Kosjar
643854cb8b Clang: Fix incomplete JobRequest in tests
Change-Id: Ibbe8f2722c81393d997efb33e6b29e01fde5eee7
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-08-03 08:26:49 +00:00
Nikolai Kosjar
91cf73361b Clang: Clean up JobRequest::ExpirationReasons
Make it a class enum and remove some noise.

Change-Id: Icd83f680c0df5eed0579c853ce5b4615e7822a28
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-08-03 08:26:43 +00:00
Nikolai Kosjar
724573324c Clang: Track visibility timepoint of documents
This enables determination of "most recenlty used" documents, which is
needed for a follow-up change.

Change-Id: I7b2c9001fd00173044983780e99817b4416e280e
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-08-03 08:26:39 +00:00
Nikolai Kosjar
ff05889755 CppEditor: Abort async schedule for synchronous CppUseSelectionsUpdater case
...since this makes no sense. If we are waiting for some results
synchronously, no other update should be triggered.

Change-Id: I5452c162d1608f841234ac8b9b7f3290828a5eb7
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-08-03 08:24:50 +00:00
Alessandro Portale
dbf9bd444b Wizards: Refresh the basic Qt Quick Application wizard
It now really creates an empty project.
Also, adapt the QtQuickPrototype template accordingly.

Change-Id: I0749805211df080c88cad1b9c2d476d56836c18a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-08-02 17:00:52 +00:00
Samuel Gaist
d6591625c3 Add support to change the number of lines of the compile output
This patch adds support to modify the number of line shown in the
compile output window. This will allow users with big projects to have
more room to look at when compiling.

Task-number: QTCREATORBUG-2200
Change-Id: I1023b2150a3eff4a33b8872fb711d150e5a8b00c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-08-02 15:29:04 +00:00
Nikolai Kosjar
301dd629e6 ModelEditor: Fix build
stereotypedefinitionparser.cpp:205:59: error: 'value' has incomplete type

Change-Id: I6493734406c9fa4e3130cd562ca3ac3ab3a28c07
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-08-02 12:04:08 +00:00
Marco Bubke
98035954c9 Sqlite: Add Read and ReadWrite mode to database
We want open databases in read only mode too.

Change-Id: I3b20602d4bd7841c9fca3260edce082d21022052
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 11:50:26 +00:00
Marco Bubke
52a911b972 Sqlite: Cleanup table and column handling
Using values instead of pointers makes the handling much easier. We can
remove ColumnDefinition too, and use SqliteColumn instead.

Change-Id: I224db9cc569c4dfb6e2746179b02096904bfbccb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 11:50:18 +00:00
Marco Bubke
a41183f6c7 Sqlite: Add variadic bind and write functions
You can now write

SqliteWriteStatement statement("UPDATE test SET name=?, number=?
                                WHERE rowid=?", database);

statement.write("see", 7.23, 1);

and

SqliteWriteStatement statement("UPDATE test SET name=@name, number=@number
                                WHERE rowid=@id", database);

statement.writeNamed("@name", "see", "@number", 7.23, "@id", 1);

This is more type safe than using variants and performant too.

Change-Id: Ie1ed2a6d326b956be5c4ec056214f3f5b1531f45
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 11:50:12 +00:00
Marco Bubke
71e1f66284 Sqlite: Add excute to the database
To execute some simple pragmas etc..

Change-Id: Iaa74406a182897dd55ee3ee8dc4d4b94bb8a8e11
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 11:50:07 +00:00