Commit Graph

560 Commits

Author SHA1 Message Date
Marco Bubke
b9bbadcc7a White space fix
Change-Id: Id5c5af2ae6821e4d84895cbcdcea4c6fec2973eb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-09-25 14:03:55 +02:00
Marco Bubke
a0f17e00e4 QmlDesigner.NodeInstances: Fix supported type because of qvariant changes
Change-Id: Iec63a16218420e546e612909380dcd4f5bdb4a30
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-09-25 14:03:49 +02:00
Marco Bubke
d7bd46dbe6 QmlDesigner.NodeInstances: Add end puppet command
Change-Id: Ice3c6ce1bb0d16d4ffbc33557b12fa147ac6058c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-09-25 14:03:33 +02:00
Daniel Molkentin
745cb4b7ec Introduce $$QTC_PREFIX
'make install' now installs to $(INSTALL_ROOT)$$QTC_PREFIX/...

This is used for giving the contents of the 7zips an additional prefix.
(previously done by doing an additional copying step in bindistHelper).
QTC_PREFIX can also be used to give Qt Creator a different install path
at qmake time, and defaults to /usr/local on Linux.
On Windows and Mac there is no default for QTC_PREFIX.

Usage: qmake -r QTC_PREFIX=/qtcreator-2.6.0 && make &&
INSTALL_ROOT=/tmp/creator-dist make install

Change-Id: Id30781e14bfdde52531800f22b22e39f0459e806
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-09-25 10:14:51 +02:00
Marco Bubke
f6f59c08d5 QmlDesigner.NodeInstances: Use the 4.8 QDataStream
The 4.8 Version of QDataStream is the lowest common denominator.        temporaryOutDataStream.setVersion(QDataStream::Qt_4_8);

Change-Id: I4aa681473b6349bd3e859f49d7233ff4a6d2911b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-09-24 11:46:34 +02:00
Marco Bubke
d8d862f261 QmlDesigner.Instances: Fix type registration
Change-Id: I85378c0a2884a7c8886482f38bad24210ef33d69
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-09-24 11:46:28 +02:00
Marco Bubke
770ab68c45 QmlDesigner.Instances: Refactor the qml2 puppet
Change-Id: Iaa7a744ecf13e011addc573a381ea523d2d50a55
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-09-24 11:46:20 +02:00
Christian Kandeler
3d9e492860 Do not use the fromAscii() and toAscii() functions.
They are deprecated in Qt 5. Use fromLatin1() and toLatin1() instead. In
Qt 5, these always do the same thing as their "Ascii" counterparts. The
same goes for Qt 4, provided QTextCodec::setCodecForCStrings has not
been set, which it hasn't.

Change-Id: I04edeb376762b6671eff8156094f0d5e2cb8e1ea
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-09-21 21:03:48 +02:00
Christian Kandeler
6d06d47a6e Do not use qMemSet and qMemCopy.
They are deprecated in Qt 5. Call std::memset and std::memcpy instead.

Change-Id: I53c22283208b4d6fdfcba870c3b141f3c02001bd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-09-21 15:40:27 +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
c12cefbb51 QmlDesigner.NodeInstance: Add environment variable to disable shared memory
Change-Id: I4146186d57322e8dd06b5c3baf538c98119ff201
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-09-12 17:23:00 +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
Marco Bubke
505c90dbf7 QmlDesigner.NodeInstances: Improve shared memory for pixmap container
Change-Id: I69e815d9f08404931823d9ae5abd0919bd4206b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-09-11 15:41:32 +02:00
Eike Ziller
b56b1c7d59 Revert "Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT)."
It depends on and mixes in changes made in another change on gerrit
that is not merged, so it breaks the package build.

This reverts commit c29bf6f652.

Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-07 10:02:40 +02:00
Daniel Molkentin
c29bf6f652 Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).
Reason: $INSTALL_ROOT is only meant to be used by packagers
to temporarily put the contents into a different location,
which is needed for fakeroot packaging.

QTC_PREFIX is not a qmake variable, and defaults to
/usr/local. On Windows the default prefix is "QtCreator",
since "make install" is expected to be used in
a packaging context only where either INSTALL_ROOT
should be used or QTC_PREFIX should be set to the
absolute destination path where e.g. an installer
generator will pick it up.

Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-05 16:37:42 +02:00
Marco Bubke
93e329e1eb QmlDesigner.NodeInstances: Use SharedMemory for image transfer if available
Sending images over the local socket is slow, but the Mac has a 4MB limit
shared memory. So we now use what we get and than fallback to the local
socket.

Change-Id: Idf40ee1603572c9e45bb1ed3e1abc7caf19e6fca
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 17:24:47 +02:00
Alessandro Portale
ae23d50576 Removal of Symbian support
Qt Creator's support for Symbian was at its peak in version
2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6.
It is most likely rotten. Let's remove it!

Also, the Symbian support code was spread throughout the whole
Qt Creator code base. The plugin interfaces evolved in the
meantime and target platforms like Android or QNX have 99% of
their code in separate plugins.

In case anyone wants to revive Symbian support in Qt Creator,
please create a plugin for it.

Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-22 13:42:42 +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
Robert Loehning
5635272b44 Improved check for NULL-pointer deref
Change-Id: I99fac91fe997a8f6437998687cf9d30557fa818e
Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com>
2012-07-27 16:41:13 +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
Oswald Buddenhagen
b830703c9c Merge branch '2.4' into 2.5 2012-04-12 09:39:18 +02:00
Robert Loehning
b41171c847 Normalized connect()s
Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-06 12:46:52 +01: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
Morten Johan Sorvig
b0cd54c1ec Replace Q_WS_MAC with Q_OS_MAC.
We want to carry over all mac-specific code paths
to Qt 5. WS_MAC is no longer set; OS_MAC is.

This change is compatible with Qt 4 builds since
OS_MAC is set whenever WS_MAC is. (OS_MAC would
also be set for the theoretical X11/Mac platform,
but that's anyway not a supported configuration
for Creator)

Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-26 11:06:12 +01:00
Kai Koehne
8cd370e163 Debugger: Fix JS debugging on Harmattan PR1.2
So far we assumend that the JSDebugAgent service switches to
the Enabled state after the constructor has run. That's apparently
not true for Harmattan PR1.2 (maybe the app / Qt calls process
events by hand, maybe it was a race condition from the start).

Fix this by checking the status already in the constructor, and
register ourselves as debugger agent if status == Enabled.

Change-Id: Icae189102116c8b572e05ce6c64f14b8f428ed2f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-24 15:37:13 +01:00
Christian Kamm
38d90e58d0 qmldump: Fix dumping empty names for generated QMetaObjects.
Task-number: QTCREATORBUG-6543
Reviewed-by: Roberto Raggi
Change-Id: I81af457eed14a2f863a0a92d4f5ff69c2dc48d67
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2011-11-17 13:54:11 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
2011-11-11 09:46:25 +01:00
Christian Kamm
a037609c3f qmldump: Add a flush to fix output redirection problems on windows.
Task-number: QTCREATORBUG-5825
Change-Id: Ib086e8ed213738516015334736b1a2badb202993
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-03 11:17:04 +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
Pawel Polanski
a558cedcd0 Symbian: A typo while including QmlJSDebugger library
Case sensitive systems do not recognise the library

Change-Id: I59d296a3bc38669bb2dc58e0bafeafe792e41543
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-10-31 13:51:24 +01:00
Eike Ziller
5dbe570f9c Fix licenses.
Change-Id: I834bc5da86c97ddaeefb43011444da8ed0e85180
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-10-18 17:41:23 +02: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
hjk
5295e05310 minor style
Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7
Reviewed-on: http://codereview.qt-project.org/5122
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-19 11:24:14 +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
7fa9e52d70 QmlDesigner.NodeInstances: Create effect items only in the render process
Change-Id: I0506bf898582ba8e26a22f51737eae4d82f06c63
Reviewed-on: http://codereview.qt.nokia.com/4004
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-08-31 18:50:04 +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
f6f6045153 QmlDesigner.NodeInstances: Fix frame dropping for last frame
Change-Id: Ie8c66c55f0236043441043727f31c9040a5dfc3d
Reviewed-on: http://codereview.qt.nokia.com/4008
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-08-31 18:49:46 +02:00
Marco Bubke
3937a20f18 QmlDesigner.NodeInstances: Fix frame dropping for last frame
Change-Id: Id70b1bc0af09293628fe2242f4bebeb30c1ae230
Reviewed-on: http://codereview.qt.nokia.com/4007
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-08-31 18:49:39 +02:00
Marco Bubke
c13624fb2f QmlDesigner.NodeInstances: Preview images for Qml2
Change-Id: I00ba96458ab8cb2e9d9766e1ecfeaea15bf2e040
Reviewed-on: http://codereview.qt.nokia.com/4006
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-08-31 18:49:32 +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
432a36283f QmlDesigner.NodeInstances: Use v8 private headers
Change-Id: I4c0d8e08a22ee0c5b2602cc7d877071010fd9f88
Reviewed-on: http://codereview.qt.nokia.com/3976
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-08-31 18:49:18 +02:00