feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
28,084 Commits 108 Branches 368 Tags
bebf8d50a9716a296e7646fde77acf2de42b0c4c
Commit Graph

62 Commits

Author SHA1 Message Date
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
Marco Bubke
4f2ceefeff Add debug output command 
Adds a infrastructure to get text information back to the client.

Change-Id: Ie5b92f875fe4cbd5f5a8e4d60a797efa0e5cbf70
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-11-21 14:12:07 +01: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
ad94d4f09c QmlDesigner: fix warning 
Change-Id: I2addb29b617fc682aa766de9e080323133185093
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-10-02 17:13:22 +02:00
Marco Bubke
18d34fef04 QmlDesigner.NodeInstances: Share NodeInstanceClientProxy between puppets 
Change-Id: I49ffa49e45d12950150bedfa8452de4c89674ef8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-01 17:10:28 +02:00
Thomas Hartmann
7da5ba30ec QmlDesigner: remove hard webkit dependency in qmlpuppet and Qt 5 
Change-Id: Ie198a0e3d8342fb62ff51ec2475134cdf4f9dcea
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit ad535b5b62)
 2012-09-27 09:50:39 +02:00
Thomas Hartmann
7b5d701f31 QmlDesigner: compile fix qmlpuppet with Qt 5 
This patch allows compiling the qml(1)puppet with Qt 5.
Some minor fixes for private headers, cleaning up some old code
and QUrl::UrlFormattingOption got renamed.

Change-Id: I732f9f9ef0b831d09134b1d2c013efda55e36e11
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit fee6b56a7c)
 2012-09-27 09:50:22 +02:00
Thomas Hartmann
4fe44819e6 QmlDesigner: fix for qmlpuppet and Qt 5 
Change-Id: Ie199a0e3d8342fb62ff51ec2475134cdf4f9dcee
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit 362b8d989d)
 2012-09-27 09:49:54 +02:00
Thomas Hartmann
1bfd2a0c1f QmlDesigner.qmlPuppet: set QDataStream version 
We already did some refactoring on this part in master.

Change-Id: Ia878afa3aa773d2496343e052ababf30da9351d7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-27 09:49:37 +02:00
Marco Bubke
f1962c9bd5 QmlDesigner.Instances: Divide qmlpuppet and qml2puppet 
Change-Id: I06be890d22a29790dbd91a0f167b63f055369315
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-19 16:29:53 +02:00
Marco Bubke
ce9b7bf123 QmlDesigner.NodeInstances: Shared memory for value changes 
Change-Id: I3c3455f411f18322a062f144e98461691d12ada8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-09-11 15:41:41 +02:00
hjk
6a7cf405bd rename QtDebug to QDebug 
More uniform.

Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-08-06 14:55:08 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Tobias Hunger
a2e51f97a2 Remove unused member variable 
Change-Id: Ia5e6fd8a8bf405a3b48ea4e53762623db37378dd
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-06-29 13:57:20 +02:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Thomas Hartmann
d74a866bc6 QmlDesigner.instances: support for QMLDESIGNER_RC_PATHS 
Allows using qml files referencing qrc resources in the designer.

Change-Id: I8a3ae9c5a0fb38c47505cc606609acb41f648bbc
Reviewed-on: http://codereview.qt-project.org/6075
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-05 17:17:48 +02:00
Thomas Hartmann
e2e69d3e72 QmlDesigner.instances: create working stand-in object 
Create an Item as stand-in.

Change-Id: Ic6521bcade216bbb04679eabd909d2eec3d8a366
Reviewed-on: http://codereview.qt-project.org/6076
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-10-05 17:15:02 +02:00
Marco Bubke
80c1e74abd QmlDesigner.NodeInstances: Change Assert in exit 
Change-Id: I9a19ab772db406b0b1e6f9b76b997dcee17bccbf
Reviewed-on: http://codereview.qt-project.org/5244
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 17:06:49 +02:00
Thomas Hartmann
8e9da5f797 QmlDesigner.instances: support for auxiliaryData @NodeInstance 
This allows overwriting values in node instances only.

Change-Id: I596323a9ebc112033c9811a8aaf35fed371cb867
Reviewed-on: http://codereview.qt-project.org/4924
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-20 09:42:42 +02:00
Marco Bubke
9837dadbcb QmlDesigner.NodeInstances: Refactor isManipulatable to isChangeable 
Change-Id: Icfc508e1549f4cfbcdda09b4611b2d66b4e2de1d
Reviewed-on: http://codereview.qt.nokia.com/4287
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-06 18:07:55 +02:00
Marco Bubke
387eebf4e9 QmlDesigner.NodeInstances: Render only items with content 
Change-Id: I9f17f369816763b2ac983d557d6bcaa723a28139
Reviewed-on: http://codereview.qt.nokia.com/4286
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-06 18:07:37 +02:00
Marco Bubke
65f5c42bc5 QmlDesigner.NodeInstances: Fix reparent bug 
Change-Id: I4a05ddc9e28e02aa9b9a8f602b3726fc53743245
Reviewed-on: http://codereview.qt.nokia.com/4101
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-05 15:17:14 +02:00
Marco Bubke
ed842542a5 QmlDesigner.NodeInstances: Fix crash for dot properties 
Change-Id: I5fcecd6fb1e50220053b2769e549f62203f33a06
Reviewed-on: http://codereview.qt.nokia.com/4075
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-01 19:53:04 +02:00
Christian Kamm
2da3219909 qmlpuppet: Fix build with Qt 4.7.4. 
Change-Id: I74f0784d76f8fa7137db22a251deaab9d99481dd
Reviewed-on: http://codereview.qt.nokia.com/4040
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-09-01 09:23:30 +02:00
Marco Bubke
d9b10dca48 QmlDesigner.NodeInstances: Fix header 
Change-Id: Ib272d772f6e8838b71c6ede8222acae4313ecae2
Reviewed-on: http://codereview.qt.nokia.com/4009
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:49:52 +02:00
Marco Bubke
cafc2a6c84 QmlDesigner.NodeInstances: Add sgitem getter to the server node instance 
Change-Id: I58baee2a8e59f2cef8add0472a3ee0c2a13fd59a
Reviewed-on: http://codereview.qt.nokia.com/4005
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:49:26 +02:00
Marco Bubke
1e60fbfba4 QmlDesigner.NodeInstances: Add support for new list interface 
Change-Id: Icd20f2a921c94f8bac73f9f61b61a34561ee2d3f
Reviewed-on: http://codereview.qt.nokia.com/3973
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-08-31 18:49:01 +02:00
Marco Bubke
991e75d65b QmlDesigner.NodeInstances: Improve SceneGraph support 
Change-Id: Ia5111f972836a1123fe857511325a82aef855449
Reviewed-on: http://codereview.qt.nokia.com/3967
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-31 18:48:04 +02:00
Eike Ziller
99ba300ae3 Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri
	src/libs/libs.pro
	src/plugins/debugger/watchwindow.cpp
	src/plugins/remotelinux/maemopackagecreationstep.h

Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
 2011-08-10 16:03:57 +02:00
Marco Bubke
26fbb50dc2 QmlDesigner.NodeInstances: Show binding in text if invalid 
If a binding on a text property cannot be evaluated it will now will be
show as #binding.text#

Change-Id: Ib1d5f406724b262833215d30ec0966a75f9dc971
Reviewed-on: http://codereview.qt.nokia.com/2452
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-08-02 10:22:34 +02:00
Oswald Buddenhagen
65c0eb5165 Merge branch '2.3' 
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
 2011-07-29 17:57:59 +02:00
Marco Bubke
776f19025e QmlDesigner.NodeInstances: Add a default dummy context 
Task-number: QTCREATORBUG-5631

Change-Id: Id1ba102d6992b8a56b105c061be89677e13e9a8b
Reviewed-on: http://codereview.qt.nokia.com/2300
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-27 20:14:24 +02:00
Marco Bubke
2125638107 QmlDesigner.NodeInstances: Move context object to a context directory 
filename_contextdummy.qml -> context/filename.qml

Task-number: QTCREATORBUG-5630
Change-Id: I76ae5432ff3052d17a3cec17d85b5cbb6d1ddc61
Reviewed-on: http://codereview.qt.nokia.com/2295
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-27 20:14:14 +02:00
Marco Bubke
e4286b7dc2 QmlDesigner.NodeInstance: Reset items if the aux size is invalid 
Change-Id: Ic5c8aa1a622b6e7d446bb1416038571b0b591f54
Reviewed-on: http://codereview.qt.nokia.com/2284
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-27 15:18:36 +02:00
Oswald Buddenhagen
ae8ac2eb2f Merge branch '2.3' 
Conflicts:
	qtcreator.pri
	src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
	src/plugins/remotelinux/maemodeploystepfactory.cpp
	src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
 2011-07-25 13:57:13 +02:00
Marco Bubke
f9a3fd338c QmlDesigner.NodeInstances: Reparent after value setting 
Change-Id: I06ac27d5043ab7f102972f0c054fc55fc77f6b15
Reviewed-on: http://codereview.qt.nokia.com/1994
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-21 18:59:40 +02:00
Marco Bubke
c6a7091c8a QmlDesigner.NodeInstances: Fix line feed handling 
Task-number: QTCREATORBUG-4161

Change-Id: I61d765bedffde4d1f15e763d92b771f22dbcd4a2
Reviewed-on: http://codereview.qt.nokia.com/1849
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-20 13:06:18 +02:00
Marco Bubke
d1b3b66d5a QmlDesigner: Fix positioner handling 
Change-Id: I519bbbfee939d4568a0de5bbe5c01912a08c6fb1
Reviewed-on: http://codereview.qt.nokia.com/1848
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-20 13:06:12 +02:00
Thomas Hartmann
95bf007e2b remove qDebug 
Change-Id: Ia83708b48f7565d8d272a797c7e18cb0931dddb0
Reviewed-on: http://codereview.qt.nokia.com/1747
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-18 13:19:59 +02:00
Eike Ziller
e5ca4b3462 Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri
	share/qtcreator/dumper/dumper.py
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/valgrind/valgrind.pro
	tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp

Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300
 2011-07-15 14:29:07 +02:00
Marco Bubke
8a5fffb945 QmlDesigner.NodeInstances: Fix restore bindings for reset 
Task-number: QTCREATORBUG-5415

Change-Id: I1cbc8dda5eb1512db52a2767837b53eb136dc387
Reviewed-on: http://codereview.qt.nokia.com/1664
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-14 16:53:08 +02:00
Thomas Hartmann
d53f595879 QmlDesigner.instances: clean import paths from .1.0 
Plugin directories might contain the version number,
but they do not have to.

We try to map .1.0 to "" for components delivered with Creator.

Change-Id: Ie785cf29d4dd64a504501d2be501fd6aa733973b
Reviewed-on: http://codereview.qt.nokia.com/1659
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-14 14:35:39 +02:00
hjk
82bbac7f90 Remove unneeded defines. 
Mostly Q_DISABLE_COPY that were covered by the un-copy-ability of the
respective base classes. Includes a few "stylistic" whitespace changes.

Change-Id: I31ca0e7bada5ed0f34776976efe22ddc444a5bf2
Reviewed-on: http://codereview.qt.nokia.com/1609
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-14 12:15:38 +02:00
Marco Bubke
b8a79174c1 QmlDesigner: Fix for code style 
Change-Id: Ib44d54414d38409ec0647c922fb81a10b5c30046
Reviewed-on: http://codereview.qt.nokia.com/1523
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-07-12 17:54:15 +02:00
Marco Bubke
2ebb5137a0 QmlDesigner.NodeInstances: Wouraround invisible root items 
Task-number: QTCREATORBUG-5152

Change-Id: I40be95844598a3a3728d0c7fbe88a9fe7a155c53
Reviewed-on: http://codereview.qt.nokia.com/1532
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-12 16:11:07 +02:00
Marco Bubke
c02f1fb78a QmlDesigner: Fix license header 
Change-Id: I4a8e1abd5a5b2431f654bb64421c872655b3ce40
Reviewed-on: http://codereview.qt.nokia.com/1458
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-07-12 13:58:57 +02:00