Commit Graph

4946 Commits

Author SHA1 Message Date
Eike Ziller
2d6f33a92b Merge remote-tracking branch 'origin/4.1' into 4.2
Change-Id: Ic536dc74b969dce910ec6b91e5a308e97348b8bf
2016-11-01 08:44:04 +01:00
Thomas Hartmann
f952c3ee4a QmlDesigner: Fallback to create types from source
We fallback to create types from source, if other means failed.
This can be required if the meta info is incomplete/incorrect when
a C++ type is mocked.

Change-Id: I50d45a6f9d7eba3483da10d9e1d7d6644d9aeb96
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 14:30:40 +00:00
Eike Ziller
457cfcfae9 Welcome: Fix that filter string was cleared when changing page
In examples and tutorials pages.
Since the pages are unloaded and loaded again when the tab changes, they
loose their internal state and require the search text to be kept as
state in the model (which makes sense anyhow).

Task-number: QTCREATORBUG-15901
Change-Id: I4fb05ca47f8337008c51e17cc95962a5e9e67fef
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-31 14:18:10 +00:00
Tobias Hunger
e6d553ce59 Wizards: Explicitly list sources in CMakeLists.txt
Task-number: QTCREATORBUG-17196
Change-Id: I478f2f945a6f7ee3183aa09871bccc7e475e5501
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 10:09:31 +00:00
Tobias Hunger
137695cae7 Wizards: Move cmake required version before project line
This is apparently necessary to establish policy before setting up
things.

Task-number: QTCREATORBUG-17197
Change-Id: I8b12e752e05e65b2275c0a97cf1b727f60c88cd0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 10:09:25 +00:00
Tobias Hunger
9e72dc343c Wizards: C++11-ify code generated by JSON wizards
Task-number: QTCREATORBUG-16983
Change-Id: I1f936f25f4e9756239e04d677cec92316e3dc75b
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-28 11:07:23 +00:00
hjk
bd2653fbaa Debugger: Introduce and use type ids instead of type in dumpers
Change-Id: I569d13d4f5d66cf1606b2b5d047b415659de539b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-28 08:11:38 +00:00
Orgad Shaneh
a6427453f4 Fix icons that moved from core to utils
Change-Id: Id3151b1cce2d97b2bfb6debaf3cebe53cd6d88ed
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-27 16:12:35 +00:00
Eike Ziller
cf47f3e807 Merge remote-tracking branch 'origin/4.2'
Change-Id: Ia346d86ad5fabe9d91454ea642cbeac5ec862699
2016-10-27 12:10:26 +02:00
Orgad Shaneh
0e134d260e Theme: Remove unused icon entries
Change-Id: I867aa0b8737b56fc3e8d357bb1559acad740ccf0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-27 09:39:42 +00:00
Tobias Hunger
63c339ffba Wizards: Generate header guard of cpp classes based on header file name
Generate header guard of cpp classes based on the header file name, not
based on the class name (plus the preferred extension for header files).

Task-number: QTCREATORBUG-15864
Change-Id: I8c2b5d4a78e59a2389091ed5933b5bdeae8e5730
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-26 14:05:24 +00:00
Thomas Hartmann
cb86cc3bdd QmlDesigner: Only register mockup object if not available
If a cpp type is somehow available do not create the mockup.

Change-Id: Ibd76429c3d1190c46a223062d77d676f728fe666
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-25 14:05:41 +00:00
Giuseppe D'Angelo
e9aaf017c2 Project wizards: warn when using deprecated APIs in new projects
As discussed at QtCS, almost none of our users know that they can
get warnings when they use deprecated APIs, and/or disable them
altogether. A first step would be getting the relevant defines added
by the new project wizards.

Change-Id: I5d4260b5aa094ac2a077b7b00eaa577108e5f612
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-25 12:00:16 +00:00
David Schulz
a826f5c6f6 Debugger: Fix some python std dumper for cdb
std::deque
std::list
std::shared_ptr
std::valarray

Change-Id: Ibc9f54b22d47a2a26c08c633d599a48d48694700
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-25 08:52:42 +00:00
David Schulz
2f6e20f37f Debugger: Add QStringData dumper for cdb
QStringData is a typedef for QTypedArrayData<unsigned short>.
Cdb doesn't return typedefed type names, but the original type.
So we just need to call the QStringData dumper from the QTypedArrayData
dumper.

Change-Id: Id4e17ea8af3888e17c0d40bd9dcc5678490e845f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-25 08:52:33 +00:00
Thomas Hartmann
3735506400 Wizards: Add empty QML_DESIGNER_IMPORT_PATH to templates
QML_DESIGNER_IMPORT_PATH can be used to create "mockup" QML files,
just for Qt Quick Designer.

Change-Id: Icd0c4143031a4b49afb89a2465622bdf2376745f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-24 12:12:46 +00:00
Eike Ziller
7480f58cf1 Merge remote-tracking branch 'origin/4.2'
Change-Id: Ied7c5b01ade2a71e92541fcced2935adcf143421
2016-10-24 13:17:28 +02:00
Thomas Hartmann
0f5f0c138c QmlDesigner: Hotfix for ColorButton
Instead of a shader I use canvas.
I had to rotate the color box to be able to use gradients.
This is working around QTBUG-56639.

Change-Id: Id321311713029d8aa66e068b02361d86debfa666
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-24 10:00:58 +00:00
Thomas Hartmann
f69518641f QmlDesigner.PropertyEditor: Fix gradient editor
Task-number: QTCREATORBUG-16404
Change-Id: I2d36c8c6170f1b8471271118b1b9e32ff61043ba
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-24 09:24:39 +00:00
Andy Shaw
c1e600a41d Remove the qt keyword from CONFIG
This is already implicitly included, however since the placement
of it can interfere with the qtquickcompiler, it should be
removed.

Change-Id: I270fa0093ad8a7739f4f25bbef477560003e2d01
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2016-10-24 08:52:39 +00:00
Sergey Belyashov
1c90a9631b Update Russian translation
Change-Id: I1353d68a2a07a031446ebe2b2ae4eb45f07f06e3
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2016-10-24 08:20:05 +00:00
Thomas Hartmann
b099ab92d8 QmlDesigner.PropertyEditor: Fixing url editor
Task-number: QTCREATORBUG-11380
Change-Id: I00cdcc8626e2e178b9fff8d11b26f87d9aad03a8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-21 16:45:44 +00:00
Eike Ziller
60ab12342d Merge remote-tracking branch 'origin/4.2'
Change-Id: I683a013896b3df773015050d5d30691d0147d320
2016-10-18 12:07:00 +02:00
Alessandro Portale
84d298e085 TextEditor: Unify error/warning icon and textmark colors
In most themes, the color of the warning and error icons differ from the
color of the corresponding textmarks (on the scroll bars). This patch
makes sure that they are the same.

Also the progress bar error color is now the same.

Change-Id: Ibce536bed1a9f43d242c2eddf9f94cc6277b2f64
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-18 09:35:37 +00:00
Thomas Hartmann
8469da333b QmlDesigner: Unify tooltip
We had slightly different tooltips for the same functionality.
I use the tooltip from the navigator.

Change-Id: I0afa53d75c01f23ebbfa1311d69e2f5a895c9e34
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-10-18 07:51:59 +00:00
Eike Ziller
c4f92146be Merge remote-tracking branch 'origin/4.1' into 4.2
Conflicts:
	src/plugins/ios/iostoolhandler.cpp

Change-Id: Iff2a56e8d74ffdb4342ef75020099cced297a0bc
2016-10-18 08:02:35 +02:00
Sergey Belyashov
401b58f791 Update Russian translation
Change-Id: I898b6166959db375273376e484aeb9956550142d
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2016-10-17 15:56:25 +00:00
Eike Ziller
a2871e5513 Merge remote-tracking branch 'origin/4.2'
Change-Id: I3a54f679238e6eb4f053608286fc39eae3041561
2016-10-17 16:22:08 +02:00
Thomas Hartmann
669a77bac4 QmlDesigner.PropertyEditor: Fixing font issues
fully qualify properties to avoid ambiguities

Task-number: QTCREATORBUG-16403
Change-Id: I0f0f7a7dbf28f51aa82bf3e2fd2652189c460102
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-17 10:20:00 +00:00
Thomas Hartmann
8af2c18341 QmlDesigner.PropertyEditor: Fix color logic for LineEdit
Explicit changes should be highlighted in blue.

Change-Id: I221016e5cd70643ae68faf7ebd0d6e0b1616a41c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-17 09:45:22 +00:00
Thomas Hartmann
57e0bb7d84 QmlDesigner: Adding ExtendedFunction button to UrlChooser
This allows to edit/set bindings on urls for e.g. images.

Instead of the hack before we now use padding in the style
to reserve space for button.

Task-number: QTCREATORBUG-13328
Change-Id: I94bad70618440a2ed835629e561a394d76990883
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-17 09:44:55 +00:00
Thomas Hartmann
5da074f95a QmlDesigner: Fix ESC issues
We do not want to switch to the editor whenever pressing ESCAPE.
Using shortcut override does not work for QQuickWidget.

Therefore we register our own action and disable it.

Change-Id: I399265a5254767d2825edf3fe823dd35177a6ce5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-14 15:20:00 +00:00
Thomas Hartmann
d81becd5fc QmlDesigner: Ensure lineedit has the correct color
Task-number: QTCREATORBUG-12513
Change-Id: I5a169561cb378bbe952c5544ec86510a9b7349f3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 16:00:05 +00:00
Alessandro Portale
b17c43b6d9 QmlDesigner: Make sure that the export alias icon is not scaled
SecondColumnLayout would otherwise scale it up, at least on HightDPI.

Change-Id: I5c1bd6357e8559deee26002b90128abfbacf449f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-13 14:48:18 +00:00
Christian Stenger
e0a6b45f22 Dumper: Fix padding handling (32bit)
This also reverts 3d68a8d0de.

Change-Id: I3e527096b4d36a102f010e538e428654cc3b783c
Reviewed-by: hjk <hjk@qt.io>
2016-10-13 13:26:31 +00:00
Thomas Hartmann
034f1728ea QmlDesigner: Set QQuickItem parent if item is written to a property
The QQuickEngine does the same.

Before in cases like this:

Item {
   Slider {
      handle: Item {
      }
   }
}

The item parent of the handle was the root item instead of the slider.

Change-Id: Ia022c82c6d85c2a957763c56639ac77bca9297e6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 11:39:25 +00:00
Thomas Hartmann
33e5ff9ecf QmlDesigner: Adding support for font spacings
Change-Id: I55843cade308cab00f4394a239507447fb84e0da
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 11:16:50 +00:00
Thomas Hartmann
eed82c8268 QmlDesigner: Adding support for text capitalization
Change-Id: I236e8e3152929cd2a5669c78aa7841e84a211aa3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 11:15:24 +00:00
Thomas Hartmann
b0d5887638 QmlDesigner: Adding support for font weight
We have to tell the rewriter that an enum scope called "Font"
does exist.

Change-Id: Ib77a099d94ec84b99e54e3c9151249df53eb53fa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 11:13:51 +00:00
Thomas Hartmann
5d5c4aa9cc QmlDesigner: Adding support for fontSizeMode
Change-Id: I34d5b4b801951929c8463ac741ee89977a017781
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 11:11:06 +00:00
Thomas Hartmann
92a085d273 QmlDesigner: Adding support for the render type of text
Change-Id: I0690f8ec77cc5c76255d4a49cd91bb3c23e12728
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 11:08:30 +00:00
Thomas Hartmann
da202bff82 QmlDesigner: Adding support for padding
This property has been added to Qt Quick 2.6.
We do not show the padding section for Qt Quick versions
that do not support padding.

Change-Id: I10123c65849e1708d452320ba3e3b4cb19f5b5bb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 11:05:26 +00:00
Christian Stenger
3d68a8d0de Dumper: Fix dumping of QImage on 32bit
Change-Id: I3cc10a858f392ea34418698411d250809ba374e4
Reviewed-by: hjk <hjk@qt.io>
2016-10-13 10:14:18 +00:00
hjk
cdb218a3e1 Debugger: Show raw object data for pixmap
"Separate display" can be triggered for QRasterPlatformPixmap on
the embeddded QImage.

Task-number: QTCREATORBUG-17107
Change-Id: Ib54a6f76f634b0dcf601836dc10609f212581d14
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-13 10:08:33 +00:00
Thomas Hartmann
2c9fb06b97 QmlDesigner: Adding elide property to text
Task-number: QTCREATORBUG-13455
Change-Id: I7e333840ccf2b7dde85f25f60392158167798c54
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-13 10:03:16 +00:00
David Schulz
9ad46e7d04 Debugger: Fix QDir dumper for Cdb
Calling functions is currently not supported in the
cdb python dumper.

Change-Id: I07da5ba93ea3ad838e758ca79062ae9aa4e8fabc
Reviewed-by: hjk <hjk@qt.io>
2016-10-13 07:51:26 +00:00
David Schulz
b01119543f Debugger: Overwrite unsupported call functions in cdbbridge
Change-Id: I64f933d649432fb680fc7e2e0cdfa251e798a58c
Reviewed-by: hjk <hjk@qt.io>
2016-10-13 07:51:22 +00:00
David Schulz
792a9015ec Debugger: Fix std vector dumper for msvc
And potentially QNX

Change-Id: I53bd34df5b3b4dfbaa50cd84c5dd9d3c975181d8
Reviewed-by: hjk <hjk@qt.io>
2016-10-13 07:51:13 +00:00
Eike Ziller
5b47c653c1 Merge remote-tracking branch 'origin/4.1' into 4.2
Change-Id: Ibe4cd5522e1d87d56d2aae7a429282b41bf18647
2016-10-12 16:02:47 +02:00
hjk
a33ed283b5 Debugger: Add a dumper for TNimNode
Change-Id: I62f1a0b07bac22bcc34a47b9848d3c92f25d31f0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-12 10:47:46 +00:00