Commit Graph

44349 Commits

Author SHA1 Message Date
Alessandro Portale
eb5de6a897 QmlDesigner: Reduce theme processing of CSS files
Don't do it 4 times in a row.

Change-Id: I21ca89310e7e0c3498fcb8bd50c105c893d2f267
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-08-09 10:58:37 +00:00
Ulf Hermann
88b113c850 QmlProfiler: Reverse start dependencies for LocalQmlProfilerSupport
We need to start the local server before the application, as the
application has to connect to it. If we use a TCP connection, we will
retry. So it doesn't hurt to start it before the application, either.

Change-Id: I64c24f922040d0ac58fe4f05abffef9ec24e3e9a
Reviewed-by: hjk <hjk@qt.io>
2017-08-09 08:37:24 +00:00
hjk
96dd315f61 ProjectExplorer: Remove RunWorkerState::Failed
It is always acted upon essentially the same as Done, but
complicates the scheme.

Change-Id: I8d9161fb162195a533c7ed29e251c3f486479dc9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-09 08:01:43 +00:00
Ulf Hermann
2c6be25dcd RemoteLinux: Use stop dependencies for QML profiling
Change-Id: I8a4f531928f46c6866c798d79476fdd37875326c
Reviewed-by: hjk <hjk@qt.io>
2017-08-08 15:17:12 +00:00
Ulf Hermann
c392d3ee13 ProjectExplorer: Kill dependent RunWorkers if dependencies go away
There is no point in e.g. keeping the QML profiler RunWorker going if
the process has spontaneously stopped.

Change-Id: Ifdae17231cb193fd220397fa0739a74871ceeab3
Reviewed-by: hjk <hjk@qt.io>
2017-08-08 14:12:38 +00:00
Ulf Hermann
ff9e55d5fb QmlProfiler: Use stop dependencies for RunWorkers
Change-Id: If4d0af85c6e537e6d9a35dc877f7542c91a2bc13
Reviewed-by: hjk <hjk@qt.io>
2017-08-08 13:58:42 +00:00
Ulf Hermann
a028f6717f ProjectExplorer: Add stop dependencies for RunWorkers
A run worker will only be stopped if all its stop dependencies are
stopped.

Change-Id: I16a42253874adafb9ca87d175bfb361fae46cc39
Reviewed-by: hjk <hjk@qt.io>
2017-08-08 13:58:36 +00:00
Ulf Hermann
8b5582c424 ProjectExplorer: Rename worker dependencies to "startDependencies"
There will be stopDependencies, too, which apply when stopping the
runcontrol.

Change-Id: Id72771d28cbb6b254572c9f93db93e0d054b890f
Reviewed-by: hjk <hjk@qt.io>
2017-08-08 13:57:38 +00:00
Marco Bubke
965379bc63 Utils: Don't touch the data if nothing is replace in SmallString
We called reserve for even if we do not found anything to replace.

Change-Id: I01dfbb9e8152605c01fa007eb93586f9a30cf56e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-08 12:30:59 +00:00
Nikolai Kosjar
63e16d6346 C++: Limit number of nested class instantiations
...to avoid out of memory crashes.

Task-number: QTCREATORBUG-18649
Change-Id: I5e121bf4be0fd0c01a97a182ed07ee7552fb68ac
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-08-08 07:03:59 +00:00
Christian Stenger
48de91f422 AutoTest: Be consistent when naming test root nodes
'Quick Tests' was the only plural form used as root node. So, strip
the trailing 's' and use singular for all.

Change-Id: I7f009294168446c5541fdaea097ef3c9e28983e7
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2017-08-08 04:55:25 +00:00
Christian Stenger
58aef63959 AutoTest: Fix handling of running selected Quick Tests
Unnamed Quick Tests cannot get explicitly selected.
They also should not get executed implicitly if we try
to execute a named Quick Test of the same project, but
only if "Run All" is triggered.

Task-number: QTCREATORBUG-18501
Change-Id: I5cddbca5bffd2d5f82e121e0455226e4b388a293
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2017-08-08 04:55:16 +00:00
Orgad Shaneh
f8caf4f367 QmlProfiler: Fix linkage
76:5: warning: instantiation of function 'QTest::qCompare<ProjectExplorer::RunControl *, nullptr_t>' required here, but no definition is available
qtestcase.h:180:5: note: expanded from macro 'QTRY_COMPARE_WITH_TIMEOUT'
qtestcase.h:89:17: note: expanded from macro 'QCOMPARE'
qtestcase.h:364:10: note: forward declaration of template entity is here
76:5: note: add an explicit instantiation declaration to suppress this warning if 'QTest::qCompare<ProjectExplorer::RunControl *, nullptr_t>' is explicitly instantiated in another translation unit
qtestcase.h:180:5: note: expanded from macro 'QTRY_COMPARE_WITH_TIMEOUT'
qtestcase.h:89:17: note: expanded from macro 'QCOMPARE'

Change-Id: I0d9ed4eb9109cbc93439f655781cee34331719ce
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-08-07 17:20:23 +00:00
Jochen Becher
bfa0d0b9fb ModelEditor: Use even more member initializers in modelinglib
Change-Id: Ie2ec6e6153b3959787bf50b3be9066edf7ab883e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-08-07 17:04:49 +00:00
Jochen Becher
48d63575b0 ModelEditor: Use more member initializers in modelinglib
Change-Id: I8e0a93e0b83c45e0e8c20a92657340b24a346849
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-08-07 17:04:30 +00:00
Jochen Becher
247d47c266 ModelEditor: Replace 0 with nullptr in modelinglib
Change-Id: I9c0c1c6b0d9410e5f4ece358fc6fd262a15c85fb
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-08-07 17:04:20 +00:00
Jochen Becher
40acf8c191 ModelEditor: Replace 0 with nullptr in plugin
Change-Id: I38b34213790dd165637d0d5096a4640eb43e8e0c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-08-07 17:04:10 +00:00
Alessandro Portale
16b2b16238 Wizards: Add a Qt Quick Controls 2 "Stack" wizard
For applications with stack navigation

Change-Id: I33eea6460ad416755d25660f206dfe61ec555b88
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-08-07 14:48:18 +00:00
hjk
17d6ed15ca ProjectExplorer: Fail more gracefully
... when SomeDevice::portsGatheringMethod() is not implemented.

That's more a debugging help than an actual solution for the user.

Change-Id: I2ab97f6fb00c4d5cfebb60e58cf948d725f3d6a6
Reviewed-by: Wolfgang Bremer <wolfgang.bremer@pelagicore.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-08-07 14:36:16 +00:00
Nikolai Kosjar
096253bf6e CppEditor: Adapt test_autoComplete
...for the case "Insert Open Curly Brackets Into Empty File".

This should have been adapted in

    commit a6aa287720
    C++: Fine-tune auto insertion of '}'

Change-Id: I895fe5fd0d98f7736cc5506c33f8eb7fafca8f9a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-07 13:01:39 +00:00
Nikolai Kosjar
9092ef7992 C++: Do not insert matching } within string
Regression from

    commit a6aa287720
    C++: Fine-tune auto insertion of '}'

Change-Id: I3ede8c7a1e3c73708d5d5a59c314e4b4596976b2
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-07 13:01:30 +00:00
Ulf Hermann
cac4b7c87c QmlProfiler: Make sure local runner test fails before test run ends
QTimer::singleShot postpones the execution of the test methods. If we
return from the current test method before, we might end the test run
before the code gets executed. This was hiding failures.

Change-Id: I0250cd37e5b25f2a72752a2d6f3abcac3314946a
Reviewed-by: hjk <hjk@qt.io>
2017-08-07 12:45:48 +00:00
Christian Stenger
60ccbac5dd AutoTest: Add minimal logging to TestConfiguration
This might help to figure out what is wrong if we are
not able to determine which run configuration must be
used or if this determination goes wrong.

Task-number: QTCREATORBUG-17882
Change-Id: I6f1dc573b4a8c07035fa521d056ccde890f07142
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2017-08-07 12:25:42 +00:00
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
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
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
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
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
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