Commit Graph

499 Commits

Author SHA1 Message Date
Eike Ziller
4a826ada04 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa
2016-04-22 15:13:58 +02:00
Eike Ziller
89c2b2cd32 Support make install also on OS X
It can be helpful, is not much effort, and parts did not restrict the
install target to non-OS X already.

Change-Id: I3501f37f089e981cf3f72d9250c9b9161d1565d6
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-04-22 06:46:11 +00:00
Thomas Hartmann
27c00777d5 QmlDesigner: Fix assert
Trying to serialize a void start  using QVariant does assert.
Solution: Ignore properties of type void star.
This was triggered by TreeView.

Change-Id: Idca5646a472fdfce8761861f5bf889bb73300fff
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-21 13:06:49 +00:00
Ulf Hermann
06b09cf4a9 QmlPuppet: Don't compare C string literals with ==
Change-Id: Idaafbc650849744af660e896bf875bdd43e6ae36
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-04-21 09:50:25 +00:00
Eike Ziller
5c87432260 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp

Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
2016-04-12 11:34:46 +02:00
Tim Jenssen
217fef2b1b QmlDesigner: fix binding is not working
Change-Id: Ic40eca09f281626428157dd94ed802c846b2f7e9
Task-number: QTCREATORBUG-15942
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-04-06 15:18:11 +00:00
Thomas Hartmann
eb172fbbd4 QmlDesigner: Fix assert
Trying to serialize a QModelIndex using QVariant does assert.
Solution: Ignore properties of type QModelIndex.

Change-Id: Idca5646a472fdfce8761861f5bf889bb73340df7
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-06 13:10:04 +00:00
Eike Ziller
1ae483fc83 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/libs/utils/tcpportsgatherer.h

Change-Id: I495f3e05789f09efb8b1e84827893423a5b5b60c
2016-04-05 14:11:47 +02:00
Thomas Hartmann
b0af88c0dd Fixing crasing Timer
A "raw" QObject (created instead of the Timer) will crash the engine later. Instead we setup
the QObject using createPrimitive().

Task-number: QTCREATORBUG-15916
Change-Id: I5f0dd9c887fd57d492222d221e54f267e12a5044
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-05 11:09:07 +00:00
hjk
39a38d5679 Wholesale conversion to #pragma once
Kudos to cgmb and https://github.com/cgmb/guardonce

Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-30 15:20:19 +00:00
Eike Ziller
467def6996 Merge remote-tracking branch 'origin/4.0'
Change-Id: I3f28f1f53cf2b2228928fbd7accf25d87bb40243
2016-03-23 14:15:31 +01:00
Tim Jenssen
50b1bf629e QmlDesigner: remove unused code
Change-Id: I00bc1b533f065b87a8d1b46e3296f76bf05b85d4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-03-23 12:13:48 +00:00
Oswald Buddenhagen
3c2f0096ea Merge remote-tracking branch 'origin/4.0' 2016-03-22 15:23:12 +01:00
Tim Jenssen
3cf5f29719 QmlPuppet: fix Qt 5.5 builds
Change-Id: I520be5d188e637c222ba3e709f072e2881b20db9
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-03-22 13:15:36 +00:00
hjk
49735ee5ee QmlPuppet: Make compile without QT_RESTRICTED_CAST_FROM_ASCII removed
Change-Id: I535efad65b2224337c133463da075953cc878c6c
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-18 14:17:04 +00:00
hjk
bf95512e5b Fix qml{puppet,designer} build without QT_RESTRICTED_CAST_FROM_ASCII
Change-Id: I8499cbf2e2b1bbe844373cb8549f82b5d62c0053
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-03-18 10:58:18 +00:00
Thomas Hartmann
c7a6221e6e QmlDesigner: Evaluate properties for the root item in dummy context
We evaluate properties for the root item in dummy context if
they contain "parent.".

Defining a parent in the dummy context was not working for QML 2,
because there seems to be a shortcut bypassing the metasystem for parent.

Task-number: QTCREATORBUG-15530
Change-Id: I710f1ef36b8c97cc481b9909a775f06d9e03f666
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-02-10 11:30:05 +00:00
Thomas Hartmann
ece316fb64 QmlDesigner: Adding dummydata as context property
The dummyContextObject is now set as the context object

Change-Id: I710f1ef36b8c97cc481b9109a775f06d9e03f6b6
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-02-10 10:36:34 +00:00
Eike Ziller
d18d7eaef6 Merge remote-tracking branch 'origin/3.6'
Change-Id: I4e1ec4054d7364057c63e63e293a246e64afdddb
2016-01-25 13:21:18 +01:00
Christian Stenger
0e7c5a1c7e Revert "QmlDesigner: call directly the invalidate method"
This reverts commit 74e863f867 as it
breaks compile with Qt5.4.

Change-Id: Ifce52a7790c4f40ce0ccd56a2daacc4d32fe3257
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-01-21 12:15:08 +00:00
Tim Jenssen
74e863f867 QmlDesigner: call directly the invalidate method
Change-Id: Ic54f7d84000f3b7569128a50496c3f29354bec58
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-01-21 09:57:08 +00:00
Caspar Schutijser
653adff6e6 No need for -lrt and -ldl on OpenBSD
Change-Id: I33b29016daa950ab88632ffbc5cf54dde4c6eafa
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-01-20 17:15:00 +00:00
Tobias Hunger
38cce7eb83 Update License according to agreement with Free Qt Foundation
* Update all files in share folder

Change-Id: I8a82c3eb2eb614d4339dd4c4e690f54b5f29d813
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-01-19 16:05:29 +00:00
Eike Ziller
98257617e9 Merge remote-tracking branch 'origin/3.6'
Conflicts:
	src/plugins/clangcodemodel/clangassistproposalmodel.cpp
	src/plugins/clangcodemodel/clangassistproposalmodel.h

Change-Id: Iba30d2f4d95fa0f551afe58890d15f5835dfb715
2016-01-19 16:41:17 +01:00
Thomas Hartmann
17e5cd7085 QmlDesigner: Fix crash in qml2puppet
We should not call updateDirtyNode() for items without a window.
This will assert later in consistency checks.

Change-Id: Iff3574123a1497206de88d59fcf630ead57ef593
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-19 12:04:44 +00:00
Tobias Hunger
bf48d54b27 Convert to Qt5 style connects
Use Clazy fix-old-style-connect to turn most connects to Qt5 style.

Change-Id: Ib81da329a7c1f5cf3e76536cbcc729a5c5d6dd56
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2015-11-19 16:22:52 +00:00
Thomas Hartmann
de0ed107a2 QmlDesigner: Adding layouts to doResetProperty()
Those have to be hard coded in our code.

Change-Id: I2bdaec0716aeca56df9476f124a47e2dfc1658cb
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-10-06 10:16:20 +00:00
Eike Ziller
9dd84323df Use variables for install locations
Define variables in qtcreator.pri for the various
install locations, instead of hardcoding the paths
everywhere where they are needed.

Change-Id: Ia34de711a7f2be317272ede023e2a8b9cdcc30fe
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-09-22 12:16:08 +00:00
Alessandro Portale
374f84acc7 Qt Quick Designer: License change to Qt Commercial + GPLv3
Change-Id: I7f7aecd02892b6c616cd148fa5d845e7bc0d3b4f
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-09-18 12:12:57 +00:00
Tobias Hunger
7adb56afde QmlPuppet: Fix warning about unused static function
Change-Id: I3a7fbc18a8fe6b208600996bfa45202389009a18
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-09-15 14:21:47 +00:00
Tobias Hunger
83cea95b95 QmlPuppet: Fix warning about overriding method
Change-Id: I3cee4ab6ae27c56808e69adb9da0ffed336c3ff2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-09-15 14:21:40 +00:00
Eike Ziller
3b1a966cc8 Merge remote-tracking branch 'origin/3.5'
Change-Id: Iebaabfc2f724cd493b7cab025406531cea5cd2dc
2015-09-01 12:57:51 +02:00
Tobias Hunger
c020d1e44b QmlPuppet: Fix warning about inconsistent override usage
Change-Id: I458a04b3045961ebeadb12a6c599cdcec79e1713
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-08-27 12:13:25 +00:00
Thomas Hartmann
ced554aaab Qml2Puppet: Use helper functions from Qt 5.6
In Qt 5.6 we do not need to access the private API directly.
QmlPrivateGate is forwarded to the helper functions in Qt.

This removes direct dependencies to QML internals in qml2puppet.

Change-Id: I274cb306815824c988b6d79966f007298f6d1e60
(cherry picked from commit d6d0bd60357a41cd6c83b511fd30ab12157ed95d)
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-08-26 12:31:51 +00:00
Friedemann Kleint
e603cafbe5 qmlpuppet: Fix build against Qt 5.6
Change-Id: Ia8417541888fa6a9b282db39f906024e83fee196
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-08-25 08:15:10 +00:00
Thomas Hartmann
11fcf2842d Qml2Puppet: Use helper functions from Qt 5.6
In Qt 5.6 we do not need to access the private API directly.
QmlPrivateGate is forwarded to the helper functions in Qt.

Change-Id: I274cb306815824c988b6d79966f007298f6d1e60
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-08-19 08:16:25 +00:00
Tim Jenssen
d567dfff73 remove unnecessary Qt configs
Change-Id: I2dc2f7f1132168974d47f64331eb72b1ce83bcc0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-08-05 11:09:28 +00:00
Oswald Buddenhagen
ddea5994f3 Merge remote-tracking branch 'origin/3.5'
Conflicts:
	scripts/deployqtHelper_mac.sh

Change-Id: Ia0d5fef8c28e0bfb3b0c703ad3652e2d70d9e7d1
2015-07-17 17:25:26 +02:00
Thomas Hartmann
6dfd03596f QmlDesigner.QmlPuppet: Fix compile for Qt 5.6
Change-Id: I231bcf61e813db14c0958565cf76dd4df56b4e99
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-14 10:28:10 +00:00
Christian Kandeler
6d5a5aff94 Use a proper libexec path for Unix builds.
Change-Id: I036c806af47f07e60408a90d3a4e181a6773f866
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-09 09:08:01 +00:00
Tobias Hunger
2e6855249f PNG: Run pngcrush on images with iCCP or sRGB profiles
This quietens warnings from libPNG during startup and shrinks the
image sizes.

Change-Id: Ieb4cb5e8ba30b99653896e283c2fb2cc267257f2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-03 09:50:46 +00:00
Thomas Hartmann
98c31cfcbc QmlDesigner: Fix compilation of qml2puppet for Qt 5.6
The internal API for bindings did change

Change-Id: Ia12e5d855911aedba1c78d6bb54c7f5892f65488
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-07-02 06:53:31 +00:00
Jarek Kobus
f7c98fa6ab Replace assignment of null QString() with a call to clear().
Looks like it's a kind of rule in QtCreator code.

Change-Id: I92fb60055273d66d6e459245836df5b90d7a3cc6
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-06-16 12:07:31 +00:00
Tobias Hunger
ae477c3a4b qml2puppet: s/Q_DECL_OVERRIDE/override/g
Change-Id: I4c582486572df9d94c53163321212b15dcc042cf
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-06-08 10:51:24 +00:00
Thomas Hartmann
fa6d623dfa QmlPuppet: Remove dependency on ObjectNodeInstance in MetaInfo
MetaInfo cannot depend on ObjectNodeInstance.
I forward the QObject and the QmlEngine all the way through.
The commented code in metainfo.cpp is about defining a context
for the root item. The feature is basically unused, but we can bring
it back using a callback later.

Change-Id: I8f099b06c848e2faeaafc011ac6bd313192a64bd
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:17:38 +00:00
Thomas Hartmann
c9eb75e2f8 QmlPuppet: Register callback for notifyPropertyChange
MetaObject cannot have a dependency on ObjectNodeInstance.
Instead we register a callback.

Change-Id: I9f6e096c67caf1abd525201c9bacd363d31a2fa2
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:11:48 +00:00
Thomas Hartmann
0321f6e1a7 QmlPuppet: Clean up private API usage in ServerNodeInstance
Change-Id: Ic0890c8c6740ad2c4567b58ec9b51933d0293fc1
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:11:40 +00:00
Thomas Hartmann
4a0a1a2b75 QmlPuppet: Clean up private API usage in QmlPropertyChangesNodeInstance
Change-Id: I007bd0a8bf5be42f0f6e9ce193a35fa8a3d3f1aa
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:11:33 +00:00
Thomas Hartmann
c6a2f1fe46 QmlPuppet: Explicitly include private headers
Those headers are used implcitly.

Change-Id: I49dcfb1a04b2103866b1d828605381570fb3e5c6
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-21 10:11:23 +00:00
Thomas Hartmann
4763acbd95 QmlPuppet: Clean up private API usage in QmlStateNodeInstance
Change-Id: If1c8cee81cbdd6f90808a824c2b4d023dd8a3e12
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-21 07:39:35 +00:00