feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
48,504 Commits 108 Branches 368 Tags
bb4b0c8af8f12bb5a7c8a4aaeb6dbdba294defef
Commit Graph

348 Commits

Author SHA1 Message Date
Thomas Hartmann
18ad2973ba QmlDesigner: fixing .pro file for mac 
The relative path is not correct on Mac for deployed packages.

Change-Id: I379f3d986df118495763811617ffe1a2cfe623ec
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-03-06 15:41:04 +01:00
Marco Bubke
29bef4c280 QmlDesigner: Fix byte padding 
Change-Id: I6c7562883e9ade627fad4cdf553765e164ceaf81
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-03-05 12:47:10 +01:00
Thomas Hartmann
ee4bf638ca QmlDesigner: Type of the propertyname is now PropertyName 
And PropertyName is a typedef for QByteArray. Because we don't use the
features of QString and the source would be cluttered with QLatin1Strings
we changed the property name to QByteArray.

Change-Id: Ib70ef136bbc411504b450456bd9bb705ae93dd25
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-03-05 12:34:39 +01:00
Thomas Hartmann
efb68b0938 QmlDesigner: fix compile for qml2puppet 
Change-Id: I3fdb693d66eafc85357da138570d58586a57e592
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-02-07 12:45:02 +01:00
Sergio Ahumada
fb3b01d888 Replace com.nokia.qtcreator with org.qt-project.qtcreator 
Task-number: QTCREATORBUG-8189
Change-Id: I1c882f55eed901620ef4944bf1789645b7cff34a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-07 12:40:37 +01:00
Robert Loehning
a040424d2a Incremented year in copyright info 
Change-Id: Ia11f4d7a94465de7f12cc390855e54e3256e5455
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-02-01 09:19:26 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
 2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
Orgad Shaneh
88267a3299 Generalize QT_NO_CAST_FROM_ASCII 
Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-16 01:14:08 +01:00
Thomas Hartmann
d8d5c4302c QmlDesigner.qml2puppet: using QApplication 
Using QApplication instead of QGuiApplication.

Change-Id: I270877b9dfa89055c816eaa6ca8cbf8b3933abb6
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2013-01-14 15:52:30 +01:00
Orgad Shaneh
6e7b51f941 Qml2Puppet: Fix compilation with qtdeclarative master 
e0cb13a5 - Move no-Gui related QML types from QtQuick into QtQml
55f6a109 - Renamed QQuickItem::pos property to position

Fix some warnings

Change-Id: Iec9fe3f543f900a177d55c5de3a636bb296cbc49
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-12-10 11:27:46 +01:00
Marco Bubke
0b3eb65fc9 QmlDesigner.NodeInstances: Workaround for property cache 
The property cache in the engine is causing a crash if entry is destroyed.

Change-Id: I8bb058b3ae7c8f0c65f1b8f07676ed128e4789d3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-12-05 11:29:57 +01:00
Marco Bubke
abb7bb7880 QmlDesigner.NodeInstances: Use new designer support interface 
Change-Id: Idfca7ea37f29df3c60b4a0eacd2b9ef80bbf5754
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-22 12:54:08 +01:00
Marco Bubke
1b23a4a410 QmlDesigner.NodeInstances: Fix color reset value 
There is the color property with the r, g, b, a sub properties.
Before this change we only saved the default of the sub properties.

Change-Id: I11d4b0ed83cf8469836099a4f65942d7e8c8d8a6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-22 12:16:07 +01:00
Marco Bubke
7ef1f9d124 QmlDesigner.NodeInstances: Deactivate componentComplete in VME 
Change-Id: I18c80e0a6d3206ff863b0466d43375fdb64a6b80
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-21 16:11:22 +01:00
Thomas Hartmann
960801b52c QmlDesigner.instances: fix for QmlPropertyCache 
Setting the original parent to preserve data constructed from
the VME.

Change-Id: Ib3c31e129e2f25affee37c97f725c6bfe3fb0286
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-21 15:59:52 +01:00
Thomas Hartmann
bd67bd8d63 QmlDesigner: meta object fix 
Change-Id: Ia5db0c5293eaf07d5141054f921a80987076532e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-21 15:59:25 +01:00
Thomas Hartmann
091d1116a2 compile fix for qml2puppet 
Change-Id: Iad3c36e66e70c4ba1c885ffc10c4ea3f888aa820
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-21 15:27:04 +01:00
Marco Bubke
1600f55f62 QmlDesigner.NodeInstances: Disable text cursor 
Change-Id: Ib27752624d658096903dc3b2660f2ee199d7869e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-21 15:23:20 +01:00
Marco Bubke
1fdd172772 QmlDesigner.NodeInstances: Add debug output 
Change-Id: I97ae422fce73ef3df62a66ef4bb925454176f891
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-21 14:12:40 +01:00
Marco Bubke
7ebc7bfb80 QmlDesigner.NodeInstances: Remove unused functions 
Change-Id: I597144577c74090c2f8e58a2f3246acc922a43a0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-21 14:09:45 +01:00
Marco Bubke
bd5881f5b2 QmlDesigner.NodeInstances: Disable animations 
Change-Id: I714fbc9d1171e48bfad219ad37a03e5241851c0a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-21 14:08:12 +01:00
Marco Bubke
befb414748 QmlDesigner.NodeInstances: No animations for positioners 
The population should be not animated.

Change-Id: I51313e40d9cd266027ac0838036806d15576b511
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-21 14:06:31 +01:00
Thomas Hartmann
0fd35fcc2e QmlDesigner.puppet: licence header fix 
Task-number: QTCREATORBUG-8189

Change-Id: Ib1862dee47b3e340492c9321b9db92a7fe2b4786
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-06 15:43:07 +01:00
Thomas Hartmann
2a624649af Support for QQmlVMEMetaObject and QmlPropertyCache 
We have to derive NodeInstanceMetaObject from QQmlVMEMetaObject
to support e. g. alias properties.
The QmlEngine uses QQmlVMEMetaObject to resolve
alias properties.
Also we have to invalidate/recreate the
QmlPropertyCache if we add dynamic properties.

Change-Id: Id52dd8b380eadeb6f74b5171168f2f70c16be118
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-23 16:37:42 +02:00
Marco Bubke
1da50de19c QmlDesigner.NodeInstances: Improve matrix transformation 
Compute the matrix to the instance parent instead of the item parent.

Change-Id: I48be1b2be4b2a0db44a6d464751d591df51507fd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-23 11:16:24 +02:00
Marco Bubke
6994079f96 QmlDesigner.NodeInstance: Better content check 
Fix rendering bug for repeaters.

Change-Id: I1c56bb63ff91cd8f58e349b0f8b038d1dd7d40e9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-23 10:44:51 +02:00
Marco Bubke
ac4df34db7 QmlDesigner.NodeInstances: Polish items for data collection 
Change-Id: I3ca322ae72b546b0a55162f376a2895642c7a187
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-19 12:20:19 +02:00
Marco Bubke
e6fe6c0f1f QmlDesigner.NodeInstances: Fix compile 
QQuickView::rootItem() changed to QQuickView::rootObject()

Change-Id: I6aff12f616a5e9a968d3a646bc635c4976750ed4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-19 09:49:22 +02:00
Marco Bubke
ce911e04c5 QmlDesigner.NodeInstances: Compile Fix 
Change-Id: I1eef61360841c774d6b79887ee312f8d4bf50f8e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-18 12:59:22 +02:00
Marco Bubke
174eb7c270 QmlDesigner.NodeInstances: Fix crash for instance without object 
Change-Id: Ia08cdb194e8f67a71cdbddf162cc7f17daa517f8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-15 17:53:58 +02:00
Marco Bubke
19c561c505 QmlDesigner.NodeInstances: Don't send empty image for preview 
Change-Id: I0bb327edd702d395023f433e5225a85ecec02d4a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-15 16:32:21 +02:00
Marco Bubke
dffb1cde67 QmlDesigner.NodeInstances: Don't create preview for non root item 
Change-Id: I4456cff66c2e532a787f176bd6d62bbda80fb4f3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-15 16:32:02 +02:00
Marco Bubke
139f564599 QmlDesigner.NodeInstances: Fix node updating 
Change-Id: I2aebcaf618251b85764712be7dd5dc3c863c3ba9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-15 16:31:47 +02:00
Thomas Hartmann
c76ddfc489 QmlDesigner.Instances: crash fix 
During destruction both new parent and old parent are invalid.
The intPositioner flag is not updated (isInPositioner()) and we crash.
The check for parentInstance() avoids this.

Change-Id: I5224c58bb461956f7ce2c47349650913975aa836
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-10-15 14:35:27 +02:00
Thomas Hartmann
16c5a1493d QmlDesigner.instances: crash fix 
NodeInstanceServer::clearScene() deletes the objects.
The m_designerSupport hold pointers to all objects for cleanup
in destructor.

Change-Id: I5ad4361d0c1de6f9eb9fb0d5cd80cf66717ce7fd
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-10-12 10:33:59 +02:00
Marco Bubke
f0d4199dfa QmlDesigner.NodeInstances: Fix rendering code path 
Change-Id: I2a479e85d7ea6f5803d78d3e2ce86849c882c5a3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-11 17:58:11 +02:00
Marco Bubke
05c1e7925d QmlDesigner.NodeInstances: Fix rendering of child items of components 
Change-Id: I96d888bb97e334ff9a2a8fa3e8c2bcb931b247c1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-11 17:55:44 +02:00
Marco Bubke
8542c063ec QmlDesigner.NodeInstances: Create a component with a file path 
We used a url but anyway this is not necessary anymore.

Change-Id: Ia616fca573f941dd638141a05c0c36640fed90e9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-11 17:55:30 +02:00
Marco Bubke
42aad1fd75 QmlDesigner.NodeInstances: Fix compiling 
Change-Id: Ica08aaadca52bb416346d871bc9555fb450654f6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-11 17:55:20 +02:00
Marco Bubke
350d5d9b28 QmlDesigner.NodeInstances: Workaround for Quick 2 
Change-Id: I91c0d841cdff3f502294b5245e1b35407e5fa441
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-10 16:25:56 +02:00
Marco Bubke
baa75926c2 QmlDesigner.NodeInstances: Quick Window Manager Support 
Change-Id: I94239275ebd55bafbd7bc9650409c24471214546
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-09 14:29:26 +02:00
Marco Bubke
ca58138102 QmlDesigner.NodeInstances: More pointer fixes 
Change-Id: Ibffe642952bc135420d123dc1d271f4e2b764749
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-09 14:29:02 +02:00
Eike Ziller
d5d1c5e394 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
 2012-10-09 11:50:17 +02:00
Eike Ziller
4f0b90dd43 Fix remaining URLs and a few other things that still referred Nokia 
Change-Id: I1c85bae3a1ada7a281fedd6951b35e6a4da395e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-09 11:10:50 +02:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
 2012-10-05 21:20:50 +02:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Thomas Hartmann
76759f2400 QmlDesigner: fix qml2puppet .pro file 
Change-Id: I697a5e8d11b0aef926dd79a5e45a63ffdc567353
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-05 12:57:17 +02:00
Marco Bubke
a19495ba20 QmlDesigner.NodeInsatnces: Update positioner if binding is changing 
Only if the expression of the binding is changing.

Change-Id: Ief702082dff0ac473c8ade6f3fc0f0cf36e017f3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-04 19:20:06 +02:00
Marco Bubke
3982bc22d7 QmlDesigner.NodeInstances: QWeakPointer -> QPointer 
In Qt5 QPointer should be used instead of QWeakPointer fo QObject tracking.

Change-Id: Ic9cdfaea77574bcf866716ded62bbf2d350d02f8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-04 19:19:49 +02:00