Commit Graph

61529 Commits

Author SHA1 Message Date
Tobias Hunger
023d995460 CMake: Move some code out of the ServerModeReader
... so that it can get re-used in the to-be-written fileapi reader.

Change-Id: I2693e6bb102d910eb505882bf3468c34272a5d04
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-06-13 12:27:44 +00:00
hjk
a56d32145b Boot2Qt: Merge QdbDeviceProcess file pair into device files
Change-Id: I6ccc2791baed02bc2aec486551fb8a071a95856b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-13 12:25:19 +00:00
hjk
e461b549bf Boot2Qt: Simplify DeviceApplicationObserver further
- Use Utils::CommandLine
- Indirect member with same lifetime can be normal members
...

Change-Id: I56f09574942cbd26e5d456d7b1def5a4b2cc34eb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-13 12:25:00 +00:00
Ulf Hermann
b9924e2b4b Fix perfresourcecounter test
If qrand() generates a 0, the obtain() is ignored as that is the invalid
ID.

Change-Id: I608f2687a6ca9a40d905c665a3585bffc1ea5695
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-13 12:12:57 +00:00
Eike Ziller
f3011f057c Merge remote-tracking branch 'origin/4.10'
Conflicts:
	src/plugins/debugger/cdb/cdbengine.cpp

Change-Id: Idcfd19292730d2b0e67816715f7aa2cc0eb71c48
2019-06-13 14:03:02 +02:00
The Qt Project
0b2b21bb22 Merge "Merge remote-tracking branch 'gerrit/4.9' into 4.10" into 4.10 2019-06-13 11:53:24 +00:00
Eike Ziller
39477594da Merge remote-tracking branch 'gerrit/4.9' into 4.10
Change-Id: I033d6baa40af45ae1eb6ed82827ff51213c832f5
2019-06-13 13:53:02 +02:00
Christian Stenger
5f28af5e4d Valgrind: Handle CRLF appropriate
The valgrind parser might be used on Windows and if a
device has Windows line endings it might end up with
wrong data.
Handle the additional line ending character if present.

Change-Id: Ia86fa88f78b40e77e6236ed6769820e074a95db6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-13 11:51:47 +00:00
Tobias Hunger
66dc831398 CMake: Do not QTC_ASSERT when Qml support is disabled
Change-Id: Ifb84aeb252053e1e6d856650d6ec54c27d589fa0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-13 11:48:58 +00:00
Tobias Hunger
f3ea8e34de ProjectTree: Save state of "Hide Empty Directories" filter
Change-Id: Iafd7248242e95dc0d5205649747f46d98e05873d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-13 11:48:49 +00:00
Christian Stenger
58451e630d Tests: Enable callgrind parser tests on Windows
Change-Id: I7f8ebcc27b4acd9494fa30d87089d01454b35c48
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-13 11:42:47 +00:00
Christian Stenger
646c984ffa Update qbs submodule
To HEAD of master branch.

Change-Id: I4dddaffba671337fb39fef3b3824338bd9a3d305
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-13 11:42:31 +00:00
Robert Loehning
3959a4db14 Squish: Update verifyBuildConfig
Change-Id: I090957fc1a1af0d08714ad9d51d2873fa097b728
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-13 11:22:39 +00:00
David Schulz
990d77498a LanguageClient: remove experimental flag
Change-Id: I3406bdfc9663f8ef5ced4935941f4510902ed762
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-06-13 10:18:32 +00:00
Robert Loehning
bfd8c5d9ee Squish: Update tst_HELP04
Task-number: QTBUG-67737
Change-Id: I4808ddccbe4e83d42d24f17a80485b5464822825
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-06-13 09:04:25 +00:00
Christian Stenger
f6b2cf10ba Boot2Qt: Fix compile for gcc5.3
Change-Id: Ib104ca611d962e41352e95cef35c450307ffa029
Reviewed-by: hjk <hjk@qt.io>
2019-06-13 07:36:14 +00:00
hjk
465d4cc845 Utils: Use CommandLine in ConsoleProcess
Change-Id: I380b91513fa342819cba898196c91443622d0ae2
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-13 07:28:45 +00:00
hjk
1455ab6c07 Boot2Qt: Merge DeviceApplicationObserver file pair into device files
Change-Id: I2306210617ac4964314deeb8c1a62604715bca19
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-12 15:41:15 +00:00
hjk
df22f2b391 Boot2Qt: Simplify DeviceApplicationObserver interface
The ability to run more than one command is never used, drop it.

Change-Id: Id42c8922e1290bbb4a7a2e517dc7759dcfb0b189
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-12 15:29:11 +00:00
Thomas Hartmann
0bcdc93e19 QmlDesigner: Fix layout in templates
Because the templates did not use the pre-defined layout,
the layout was bit broken.

Change-Id: I3a11e78a8dd6ac81252fa51270de5d427e5de0c2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-12 15:19:33 +00:00
Thomas Hartmann
da3f9eb5bf QmlDesigner: Fix property editor template for colors
The color editor requires its own section.
Therefore we mark the color type with 'separateSection'.
For this to work we have to order all properties.
The properties that require their own section do come first.
The QML code generation became a bit more complicated, but
having proper default sheets for colors should be worth it.

Task-number: QDS-742
Change-Id: I1eee71aa05c66af4aaf53e0e8c5a3514a9ca6d92
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-12 15:19:10 +00:00
Thomas Hartmann
aa30828f40 QmlDesigner: Disable horizontal scrollbar for property editor
Change-Id: Id6b9dc66ca86f775c7d8fd8a5c847becb5cf96cb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-12 15:18:37 +00:00
Thomas Hartmann
05c5a8bfa0 StudioWelcome: Fix warning
Change-Id: I9a023629ff951acb9d53482795c928a2202650f9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-12 14:11:02 +00:00
Thomas Hartmann
bcf32dcc93 StudioWelcome: Final fixes for splash screen
Change-Id: If643c5ba61c2aec84c5e25b08627cb451dcd623f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-12 13:49:05 +00:00
Thomas Hartmann
2831f601fa QmlDesigner: Use OpenGL 4.1 surface for puppet
Change-Id: I520adbb54fc264e738ca5eb630f5cc7bc80ee4bd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-12 13:48:56 +00:00
Tobias Hunger
202506ce16 CMake: Make sure to run cmake when that is requested
Pass on the request to run cmake on to the builddirreaders.

Task-number: QTCREATORBUG-19704
Change-Id: Iafeba61f46d6bb6783fc62d0504bb07dde2c4612
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-06-12 13:48:07 +00:00
hjk
0981a0af25 CMake: Compile fix
Amends d5383c92a8

Change-Id: Ie0743ac01adbae7eff1d84979acaed68474bc760
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-06-12 13:43:35 +00:00
Uladzislau Paulovich
798879c797 qml | Fix pragma reformatting
After this change reformatter test (tests/auto/qml/reformatter/tst_reformatter)
starts to work correctly for singleton example (qmlsingleton.qml)
NOTE: Just cherry-picking change from master branch.

Change-Id: Ia0561aa8b920fc5c62a8dea93341721f37b68dd8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
(cherry picked from commit 749eaaad81)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-12 13:35:11 +00:00
Cristian Adam
36135aa261 CMake: Small clean-up of CMake Wizards
* Updated CMake minimum version to 3.5 (Ubuntu LTS 16.04)
* Lowercase commands
* Used the target name instead of ${PROJECT_NAME}, which nobody uses in practice
* No string quotes around the source filenames, which do not contain spaces

Change-Id: Ide9b3eb85535213798c6c35e08624cae080ebd9d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-06-12 13:34:58 +00:00
hjk
5ac71e485a ModelingLib: Use QElapsedTimer instead of QTime
... because of recent deprecation of QTime::elapsed.

Change-Id: I5bb8cd2a613a0258669055471008c5d6b4db1099
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2019-06-12 13:24:19 +00:00
hjk
ee68a4e7b4 Debugger: Remove unused declarations
Change-Id: Ib5d1b0346a52c465436306a9223e2aa554ae0801
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-12 13:23:51 +00:00
hjk
07f50c8dec Debugger: Use QElapsedTimer instead of QTime::elapsed()
Deprecation looming.

Change-Id: Ibafbac6fbe48d74ba7d88c22400d581e49e4e45d
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2019-06-12 13:23:24 +00:00
hjk
2942ae876c Debugger: Use Utils::CommandLine handling in CDB
Change-Id: I124f7eeee5eb5028fb3316f69144fdcdfe63bc4d
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-12 13:04:18 +00:00
Alessandro Portale
a38c3ac08e Remove ToolChain::suggestedDebugger()
And inline it in AndroidConfigurations, which is the only place that
made use of suggestedDebugger()

Change-Id: I87f135b5d115adb7e46b0f009c5853221e9a3daa
Reviewed-by: hjk <hjk@qt.io>
2019-06-12 12:54:43 +00:00
hjk
b43a222ae2 Debugger: Fix enum comparison
Amends fee7e9fbda

Change-Id: Ibd341822edf9e5fa1f9ddf64f98fc2866b79f12f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-12 12:31:27 +00:00
hjk
7ebe005206 ProjectExplorer: Replace RunConfiguration::executable
... by a RunConfiguration::commandLine().

That's what is typically consumed, and removes the need for some
custom runnable() implementations.

Change-Id: I7700b12cdd0965802a0add977b432314734a5a72
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-12 12:30:23 +00:00
Christian Kandeler
2391ef6088 Output panes: Improve the way to signal that filtering is active
At the moment, background and foreground colors of an output pane are
changed (via the widget's palette) when filtering is active, in order to
make it clear to the user that the output is being tampered with. There
are several problems there:
    - The chosen background color is quite garish.
    - More importantly, the palette change has no effect in the
      compile and app output panes, because their output is explicitly
      formatted and thus not affected by the general text color change.
      As a result, the output may no longer be readable.

We fix this by choosing a less intrusive approach that simply darkens
(or lightens) the pane's background color a bit when filtering is
active. This is still clearly visible to the user.

Change-Id: I41e053b4b218be57fe7655e314d4ebf93f59f505
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-12 12:20:31 +00:00
Tobias Hunger
a51b8a061e CMakeTool: Update cmake fileapi detection
CMake rejected a patch to add fileapi detection via cmake -E capabilities
output and asked to base the detection on the version number. This decision
has been revisited now and starting with cmake 3.15 the supported fileapi
object kinds and there version are reported.

Update Creator to use this information and to fill in the missing data for
cmake 3.14.

Change-Id: I382310a098925491921acf1b59099bbe0859cde2
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-06-12 11:56:19 +00:00
Tobias Hunger
d5383c92a8 CMake: Run cmake with all arguments when no CMakeCache.txt file is found
Always run cmake with all arguments when no CMakeCache.txt file is
found. This allows for the builddirreaders to become a bit simpler.

Change-Id: I67839fd560fb77f6832b1cefc3ff016baa6bae89
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-12 11:55:47 +00:00
Thomas Hartmann
b94c725f0f QmlDesigner: Reserve less space for label
We currently waste too much space for long label.
Eliding works fine for long property names.

Change-Id: I1fe2836e8c06cff93e2a48c6290265ab300e5321
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-12 11:30:20 +00:00
Thomas Hartmann
0ec78b7b3e QmlDesigner: Do not sync z value on root item
Setting the z value on the root item triggers side effects.

Task-number: QDS-800
Change-Id: I52021b7e3e59b67088a69f2a89f0cdffa90fffb8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-12 11:30:11 +00:00
Thomas Hartmann
f6db77a0cc QmlDesigner: Slightly reduce size of the spin box
Change-Id: Ida09ddf17fcdc7000b03c6020334e30cfa7c74ee
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-12 11:30:02 +00:00
Cristian Adam
25bd5976ba CMake build: Make sdktool use parts of Utils
Change-Id: I88ab8ab89951bb8966fcc48b7d4ee416015ab8e5
Fixes: QTCREATORBUG-22550
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-12 11:11:39 +00:00
Christian Kandeler
a093dfc65c Wizards: Include namespace in header guards again
This was broken in 63c339ffba while trying to fix a different bug.

Fixes: QTCREATORBUG-18157
Change-Id: Iec7e14de257195ed9bb20314b8031d3ef59df2ae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-12 11:05:12 +00:00
Christian Kandeler
50dc5674d3 ProjectExplorer: Improve "import project" keyboard event handling
Pressing return in the path chooser used to activate the "Configure"
button, which is not what users intend.

Fixes: QTCREATORBUG-17471
Change-Id: I86bc0dd9c976da35026654c7873dc4b63e45593c
Reviewed-by: hjk <hjk@qt.io>
2019-06-12 11:03:10 +00:00
Christian Stenger
d96c2e5d16 AutoTest: Fix updating parent
Skip had been added mistakenly to the insignificant
results.
Do not handle Skip as an insignificant result as
it will be correctly handled while updating the
result.

Fixes: QTCREATORBUG-22545
Change-Id: I3c09416934b1c747dd8160635b5bfaa46c31f5a4
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-12 10:27:36 +00:00
Henning Gruendl
3172773f52 QmlDesigner: Add more studio controls
* Add alignment button rows with new controls
 * Add font style buttons with new controls
 * Add anchor button rows with new controls
 * Fix CheckBox error about undefined assignment
 * Add new colors in ColorLogic
 * Fix low contrast for edit mode text color ComboBox, SpinBox, LineEdit
 * Add new icon font
 * Fix TranslationIcon background color
 * Some minor import refactoring

Change-Id: If014c3351fd33ccaf893a31033c893e13ee04821
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-12 09:15:51 +00:00
hjk
1957fbd581 Core: Use QElapsedTimer instead of QTime
Avoids deprecation warning.

Change-Id: Ia4858235184369df1ba5d80c5eca71df53287bce
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-12 08:14:32 +00:00
hjk
ffd38d2a63 ClangTools: Use QElapsedTimer instead of QTime
and while instead of forever in order to avoid deprecation warnings.

Change-Id: I0ada7b334068f2465ab107c198ff44ff8802a8bd
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-06-12 08:11:17 +00:00
Eike Ziller
23e30a03c5 Merge remote-tracking branch 'origin/4.10'
Change-Id: I3c62cf597e33e9978116944a64cdfb600eb3e24d
2019-06-12 09:24:11 +02:00