Commit Graph

5216 Commits

Author SHA1 Message Date
Jochen Becher
58a1648326 ModelEditor: add wizard for scratch models
Change-Id: Idc6841984aa258ab668416f891ecbaf7bd32164e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:23:53 +00:00
Jochen Becher
6bb2c1196d ModelEditor: Add Deployment diagrams
Change-Id: Ib8c9ce2dff3fc9d52ff35f2ad89d8c281683200e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:23:43 +00:00
Jochen Becher
991a9ce5c1 ModelEditor: Minor improvements of documentation
Change-Id: Iec789a3bd89136c3346f6ce8db636c069d7c842b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:23:13 +00:00
Jochen Becher
0c7ce54cc6 ModelEditor: Support text alignment in custom icons
Change-Id: I69a5b10a3bf46d40744b002eea47fa926a617c17
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:21:10 +00:00
Jochen Becher
eceaf47614 ModelEditor: fix text labels in sequence diagrams
Change-Id: I7825a65a6c27c5c48bc1b8e6b6b4e532b252bc5d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:20:58 +00:00
Eike Ziller
cff2cc90e2 Merge remote-tracking branch 'origin/4.5'
Conflicts:
	src/plugins/cpptools/clangcompileroptionsbuilder.cpp
	src/plugins/cpptools/clangcompileroptionsbuilder.h
	src/plugins/cpptools/compileroptionsbuilder.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.h
	src/plugins/qmlprofiler/qmlprofilertraceclient.cpp
	src/plugins/qmlprofiler/qmlprofilertraceclient.h
	src/shared/qbs

Change-Id: I364ababc5d41046d17e999096c4a7187c4e4e010
2018-01-09 13:13:00 +01:00
Sergey Belyashov
32786ea9ca Fix typo in Russian translation
Task-number: QTCREATORBUG-19555
Change-Id: I4bc595e1d724ff6231f4dc5d6fcc266c8c3468ea
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
2018-01-09 10:17:32 +00:00
Christian Stenger
38d5c585af AutoTest: Fix wizard for gtest on Windows
Change-Id: Iab9711df2455fc2efb678bfd85e8a95b2de7587c
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-01-08 14:20:02 +00:00
Marco Benelli
d11e31230c QmlJs: remove bundles for QtQuick1 type descriptions
QtCreator now assumes that QtQuick2 is used, so the relevant bundle is
loaded unconditionally.

Change-Id: Ib6b7b0c9a949e74edf0e0b7f68b0c774d7bcb451
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-01-08 13:15:23 +00:00
Orgad Shaneh
91c50e797b Themes: Fix gradient color in Projects mode
Change-Id: Ic8187fa3a04e76111afa231f993b115933cd3ac5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-01-05 14:53:59 +00:00
Orgad Shaneh
add1bdf43f Theme: Fix parsing of colors without alpha
Use QColor(const QString &) ctor instead of manual parsing.

Uncovered by a19005fc38 which made the
locator highlighting black.

Change-Id: Ic11483613510e3cf97eede396e9b7d53bbc3ff61
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-01-05 09:03:10 +00:00
Orgad Shaneh
6797ca18f6 Dark Theme: Fix bad color value
Change-Id: Ie798db7cd887ff3933832e8589c908b115699529
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-05 07:35:25 +00:00
hjk
0cce7a82fe Debugger: Add some simple dumper for std::function
Linux/gdb only, pretty print the cases of default constructed objects
and real function pointers.

Task-number: QTCREATORBUG-19410
Change-Id: I08332af649bda861d9f53c0e0feb1f37db72b875
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-05 07:20:26 +00:00
Oswald Buddenhagen
777ca8e655 Merge remote-tracking branch 'origin/4.5'
Conflicts:
	src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
	src/plugins/qmlprofiler/qmlprofilertraceclient.cpp

Change-Id: I94647f59d7a9df48168ac066555afe80f5f9b91f
2017-12-21 13:20:24 +01:00
David Schulz
b2052561cc Debugger: improve evaluate expression with cdb
Replace Evaluate with AddSymbol and create a PyValue representing
that expression

Change-Id: Ibb8ab70c41df81e9d7d683b633a070caa03036d3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-12-20 09:32:18 +00:00
hjk
79ba461a46 Debugger: Suppress variables from unrelated scopes
Change-Id: Ib7ae6c2af37a2cdb7dfd63d0622e68b55f7a778d
Task-number: QTCREATORBUG-19445
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-12-14 13:40:08 +00:00
hjk
83c13ff191 Debugger: Combine the InferiorShutdown{Ok,Failed} states
... into a InferiorShutdownFinished.

Change-Id: Icb5394f38f52f7cf300dc83f4eb8f2f0777bbcba
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-12-14 11:26:52 +00:00
hjk
585b2c62d5 Debugger: Combine the EngineShutdown{Ok,Failed} states
... into a EngineShutdownFinished. They were never handled differently,
and the only option is to proceed to DebuggerFinished anyway. So
simplify the state machine a bit.

Change-Id: Ied3be86fff6750abca578dc6788e4be1d895692b
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-12-14 09:42:44 +00:00
Christian Stenger
1d2049bffc Dumper: Fix typo
Change-Id: I2d7bbe88c4d1552dba505003020c86a406821f72
Reviewed-by: hjk <hjk@qt.io>
2017-12-13 05:43:35 +00:00
Eike Ziller
469edcdde3 Merge remote-tracking branch 'origin/4.5'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Ic1ab71d0d40fa6c90e337c8ee9d9558e8f103eaa
2017-12-12 10:53:51 +01:00
Eike Ziller
32377a9ac5 Merge remote-tracking branch 'origin/4.4' into 4.5
Change-Id: Ia5b4d0c1c2b5a410ec3215df1c19b56e236606cf
2017-12-12 10:51:24 +01:00
Alessandro Portale
a53df3892a Qt Quick Application wizards: No AA_EnableHighDpiScaling on Simulator
Avoid setting Qt::AA_EnableHighDpiScaling when running in the simulator.
Simulator detection is done by testing whether environment variable
QTGLESSTREAM_DISPLAY is set.

This amends 8c3bd61594 where all platforms
except Windows were excluded from setting the flag.

Task-number: QTBUG-64815
Change-Id: I8ab7ba9f24217915dc1d01e1f2eb5c37923c5504
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2017-12-11 10:16:25 +00:00
Eike Ziller
e2baa116ca Merge remote-tracking branch 'origin/4.5'
Change-Id: I86852d289c22210a0439e8e297819dc7276a96de
2017-11-29 09:56:22 +01:00
Alessandro Portale
8c3bd61594 Qt Quick Application wizards: Qt::AA_EnableHighDpiScaling only on WIN
Setting Qt::AA_EnableHighDpiScaling causes a few graphics backends to
malfunction. This patch reduced the setting of the flag to happen only
on Windows (it is automatically set on macOS with retina).

Task-number: QTBUG-64815
Change-Id: I08fa5d1bd2c93e7a39c23487b684bd3f7b358783
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
2017-11-28 13:36:29 +00:00
Christian Stenger
b0cbed9a17 Dumper: Do not use enumHexDisplay unconditionally
This function is available only for GDB. When using CDB or LLDB
this ends up in an exception.

Change-Id: Ie1835c1b95cac99e3f996077f6a3d80b5591c145
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-11-27 12:48:26 +00:00
Jochen Becher
20491b5160 ModelEditor: Configure poor man's sequence diagrams
Change-Id: I6bcdec40838c609ea4b01e5fc1a2b6269491d27d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-11-20 07:30:00 +00:00
Jochen Becher
56be6cc2c8 ModelEditor: Improve custom items
The default name for a new custom item can be set. The display of any
text of a custom icon can be suppressed (e.g. start element in activity
diagrams).

Change-Id: Iaaefda3a6795e0b2a63d96fd001948d302906b7a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-11-20 07:29:46 +00:00
Eike Ziller
f58a617ea9 Merge remote-tracking branch 'origin/4.5'
Change-Id: Iab6befd5e713289877aa0a47b9ce6bddfb5e2593
2017-11-16 08:49:06 +01:00
Alessandro Portale
71933a4df8 QtQuick wizards: Add 5.10 to minimal required Qt versions
QtQuickVersion: 2.10
QtQuickControlsVersion: 2.3
QtQuickWindowVersion: 2.10
QtQuickVirtualKeyboardImport: QtQuick.VirtualKeyboard 2.3

Qt 5.9, which is LTS remains preselected.

Change-Id: Ida5c234431af8cf681ad6f8206283f9a4048bcec
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-14 13:34:42 +00:00
Alessandro Portale
92fa3a756e QtQuick wizards: Bump virtual keyboard version for Qt 5.9
According to the Qt 5.9 documentation it is
   import QtQuick.VirtualKeyboard 2.2

Change-Id: Ic560e187f57e9db9e8552ec0f407766e74d20d7d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-14 13:34:37 +00:00
Christian Stenger
895eed7164 Wizards: Fix project files for macOS
Task-number: QTCREATORBUG-19286
Change-Id: I81a7486edfd34570d7b4bd82646a2e5e39a585ee
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-11-14 10:55:33 +00:00
Eike Ziller
2d30d3ddd6 Merge remote-tracking branch 'origin/4.5'
Change-Id: Ib6739725e6b251ea962880e4b72700c5be5a192c
2017-11-14 11:24:03 +01:00
Tim Jenssen
7bad32988f Wizards: remove unnecessary default values
Change-Id: Ie06b32a6d56e3f0110c0526b45fcf530e3491433
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-14 09:06:18 +00:00
Alessandro Portale
1a361a39ad QtQuick Canvas3D wizard: Remove unused variable
The variable QtQuick3DVersion is unused.

Change-Id: I714948879ce1994812ffcd997e39653081479509
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-13 15:07:08 +00:00
Orgad Shaneh
d9cb19b229 Merge remote-tracking branch 'origin/4.5'
Change-Id: I60fca091b2eac67259580acba5ae934c16d74a83
2017-11-11 19:54:32 +02:00
Sergey Belyashov
8b560e07c4 Update Russian translation
Change-Id: Id4a386c725162b4a8545e5534dd3ad6df813fad0
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-11-10 09:59:54 +00:00
Orgad Shaneh
b2faf3b767 Dark theme: Make disabled buttons distinguishable from enabled
Follow suit with Flat Dark in 249bea0e44.

Change-Id: I6e279a3fca3fecadd15651373a37ab469d57defe
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-11-10 02:12:25 +00:00
Eike Ziller
b05637131c Merge remote-tracking branch 'origin/4.5'
Conflicts:
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I726babe61e28db14d06a6a1a5c570e148745b458
2017-11-09 14:32:00 +01:00
Alessandro Portale
249bea0e44 Flat Dark theme: Make disabled buttons distinguishable from enabled
Task-number: QTCREATORBUG-19235
Change-Id: Ia7f0cc453ab38cb4d95b0f5de1a3261fd46aecdf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-11-09 08:49:28 +00:00
scootergrisen
c13a559aff Update danish (da) translation for Qt Creator 4.5
Change-Id: I6538cd7edbc9a52acc51d04f5d3f5628a9d9e7dd
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-11-08 09:02:20 +00:00
David Schulz
e6b7d35bb0 Debugger: Fix enum dumper for cdb and lldb
Change-Id: Ieea120c00553ebe88c2daca0756a1eadba5991a3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-07 14:55:13 +00:00
Eike Ziller
a9e4e3608e Merge remote-tracking branch 'origin/4.5'
Change-Id: I0194bdeda71e33fd5bc9cb3eb7a9198ae72815ed
2017-11-07 15:10:36 +01:00
Thomas Hartmann
05d969a61b QmlDesigner: Move HelperWidgets
Having the HelperWidgets next to the QtQuick directory was triggering
a bug in Qt (QTBUG-64237).

The property editor was white with Qt 5.10, because the "." import is
mapped to "./QtQuick" and was confused with QtQuick 2.x.

Task-number: QTCREATORBUG-19194
Change-Id: I4148d8e40f1e886eb41ffe6f4df62b213af5e9c3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-06 18:02:02 +00:00
Orgad Shaneh
a6cda6dbe0 Merge remote-tracking branch 'origin/4.5'
Change-Id: I16e3bb9ee3a1e6dc6edf7a65f8a137a25cda4fe3
2017-11-05 16:49:17 +02:00
Tor Arne Vestbø
357caf3b44 Allow LLDB pretty printer to skip resolving type across all modules
The lookup is quite slow, and will hang the lldb debugger,
causing Xcode to hang too.

Change-Id: Ic6579a5de9404c0040d3d304169f18109f61d2ac
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-03 13:40:16 +00:00
Eike Ziller
ba0faf229a Remove external tool for "sort text"
We now have Edit > Advanced > Sort selected lines

Change-Id: I948718a1be432e00b2646b29f173894a51691164
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-11-03 07:30:52 +00:00
Orgad Shaneh
d6ff82a244 Dumpers: Fix CPlusPlus::IntegerType dumper
Change-Id: Ia21caf874f927428c27f6ad21da031b3a32146ea
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-11-02 14:04:44 +00:00
Leena Miettinen
d8afb51c92 Wizards: Fix copy-paste error in Swipe view wizard description
Mentioned a StackView and a Drawer, which do not seem to be used in
the example. Also contained "with a" twice.

Change-Id: I51916b73731224cb633bd90f724ec7f4c2b89f91
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-11-01 14:38:33 +00:00
Tim Jenssen
2918cc59f8 Wizards: fix wrong json files
Change-Id: I185d1b559f53fa91731783c723bfffb78e93886b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-26 17:48:53 +00:00
Tim Jenssen
bd65ae1def Wizards: remove default values
Change-Id: If58b6b9753ccb3cb3baae8198c6e9e5369840ddb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-26 11:32:40 +00:00