Commit Graph

61 Commits

Author SHA1 Message Date
Caroline Chao 93ecd34c32 qmlplugindump: Update the description for the generated file
The full command was written in the generated file including
the full path to the qmlplugindump tool.
Now only the tool name without its full path will be
printed with the adjacent arguments.

Change-Id: I03aa7350d1cd6b96ce00341796f8944669989793
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2013-09-18 18:48:24 +02:00
Caroline Chao b3f45a1172 qmlplugindump: Add --defaultplatform argument
QT_QPA_PLATFORM is set to minimal by default unless
--defaultplatform is set when running the qmlplugindump tool.

This is for example useful for the QtQuick.Dialogs module.

Change-Id: I1194526ee0641d11802c4db20bd3043aebd1e261
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2013-09-18 18:48:24 +02:00
Caroline Chao 13d56d51ad qmlplugindump: QMetaMethod signals have public access
Since 56bbf3c2d5b31142e5a1b872a0118479edcf874b (qtbase)

So public signals must be dumped.

Change-Id: Ic7047660fbac40f78c7a205e760c059256c71d6f
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2013-09-18 18:48:24 +02:00
Caroline Chao 739483926b qmlplugindump: fix prototypes identification for composite types
The prototype name for the composite type is the first "default"
prototype found in the reachable types. If none is found then
the default value is QObject.

Change-Id: I40b4fefaab40e4c9f83d24c89bd026579be63e7b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-09-17 15:39:15 +02:00
Caroline Chao 0ef673efe8 qmlplugindump: Add support for composite types
Task-number: QTBUG-33106

Change-Id: I80fc817eb59256e860f3fdd591104930688ef84c
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2013-09-13 08:51:33 +02:00
Giuseppe D'Angelo 4df73e62a7 Remove qSort usages from declarative
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html

Change-Id: I8fa7d0186cc8f0ba562695974829e37f1eb87f2f
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-09-13 01:10:37 +02:00
Alan Alpert 0462193b6f Add --noinstantiate to qmlplugindump
This flag allows you to run qmlplugindump on plugins which cannot safely
create objects, such as plugins with unusual requirements or missing
essential dependencies.

Change-Id: Ifcc542b8dec5358fc8a76d78a2a272c9cbf5d78a
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-05-29 16:23:51 +02:00
Fawzi Mohamed fa4cafacff qmlplugindump: add an explicit -relocatable switch
this will enable us to switch the default to nonrelocatable

Change-Id: Ic4bff6466ee2fb6d4d1dd89829034ad239422a7e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-04-24 13:39:04 +02:00
Sze Howe Koh e72f577658 Doc: Fix module name format
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation

QtGui        -> Qt GUI
QtMultimedia -> Qt Multimedia
QtScript     -> Qt Script
QtSensors    -> Qt Sensors
QtSvg        -> Qt SVG
QtWebkit     -> Qt WebKit

Also fix a broken link to "Qt WebKit QML Types"

Change-Id: Ica6081024d3957a3ca2ef3d870f623506c69d877
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-04-23 18:29:25 +02:00
Fawzi Mohamed 3bbed9ee8f qmlplugindump: always output exportMetaObjectRevisions
Some people were confused about exportMetaObjectRevisions, and
the "all 0" as default was not expected.
Make it explicit so we might change the default in the future.

Change-Id: I1f208ba54e2b9aa1a5d46fb9971572467b69ab56
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
2013-04-15 10:46:15 +02:00
Shawn Rutledge d0491c87a9 qmlplugindump: don't crash if a composite type was a registered
This doesn't actually result in putting any information about the
composite type into the output, though.

Change-Id: I160702578f0acd22eff98e8afa288b3c9fb20076
Reviewed-by: Alan Alpert <aalpert@rim.com>
2013-02-18 17:51:35 +01:00
Sergio Ahumada 83deab8d1b Update copyright year in Digia's license headers
Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-10 19:52:37 +01:00
Kai Koehne 237027f8bb QmlPluginDump: Prevent crash if run without WM
Make sure that the minimal platform plugin is used by default.

Change-Id: I2362649dafaf823b00ab37519b516aef9ac3166b
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-11-30 11:10:59 +01:00
Iikka Eklund 46010aa7a2 Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia

Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-09-23 08:22:24 +02:00
Kai Koehne cb5c253062 qmlplugindump: Update help output
Qt.labs.particles 4.7 doesn't work since ages. Instead use
Qt.labs.folderlistmodel 2.0.

Change-Id: Ie11133adad88ac6120ab05aef9713f8e768f8bc8
Reviewed-by: Christian Kamm <kamm@incasoftware.de>
2012-09-18 08:46:50 +02:00
Kai Koehne a1e5bd1a4b qmlplugindump: Fix handling of implicit signals
Change I70affc450 added inverted logic.

Change-Id: I6cb25d3881a0487545a3eeac289a34fedcc21d8f
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2012-09-10 14:24:56 +02:00
Sergio Ahumada 5b4c2f5910 doc: fix some more typos
Change-Id: I7fa055049b9e5900d597754c6004febb153de12b
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
2012-09-10 12:26:28 +02:00
Kai Koehne 5b47966f5c qmlplugindump: Fix dumping of types
Dumping broke with commit 70a2c049.

Change-Id: Ifbae3dbc3e2d255c1e7f8848c579c04d0bf4b48e
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2012-09-07 13:57:13 +02:00
Kai Koehne 7cc5fec697 qmlplugindump: Take care of 'void' types
QMetaMethod::typeName() does now return "void" instead of an empty string (change 22d621dd).

Change-Id: I70affc450a7dd36b121cbcf580c0ca6fd5944f0b
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2012-09-07 13:57:13 +02:00
Chris Adams 70a2c0491d Refactor singleton type registration code
Previously each singleton type was registered as an implicit separate
import.  This commit changes the code so that these types are treated
just like any other type in the registration sense.

It also ensures that singleton types are instantiated per-engine.

Change-Id: I5c81c4ca5bf65210f7125d74a62a282a21838068
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
2012-08-28 04:32:48 +02:00
Glenn Watson 6ebf215fda Add type name to singleton (module api) implementations.
This change renames the previous module api implementation
to singleton types.

When a singleton type is registered, a type name must be provided
that is used when accessing the API from QML. This makes the
implementation more consistent with the rest of QML.

Task-number: QTBUG-26549
Change-Id: Iab0bb1ccf516bd3ae20aee562a64d22976e0aecd
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
2012-08-08 07:55:19 +02:00
Thomas McGuire 937bccd0e1 qmlplugindump: Add comment to file that it was auto-generated
This prevents people who do not know about this tool from
accidentally changing these files by hand.

Change-Id: I8ff889b953f7c637f914f8b5b8b07a36f3cdf58f
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2012-07-04 10:12:10 +02:00
Thiago Macieira 44f9412bf7 Change uses of {to,from}Ascii to {to,from}Latin1
This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: I03084595ddc425a988374b8352fd23e9504ffba6
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-05-04 10:36:17 +02:00
Kent Hansen 4dd4c442e1 Adapt to Qt5 meta-object changes
QMetaMethod::signature() has been renamed to methodSignature(), and
it now returns a QByteArray. Also, the new function
QMetaMethod::isValid() should be used to determine whether a method
is valid, instead of relying on signature() returning a 0 pointer.

Where it makes sense, the existing code that was using signature()
and parameterTypes() has been changed to use the new API
QMetaMethod::name(), parameterCount(), and parameterType(int).

Also, in the new meta-object revision (7), the QMetaObject stringdata
member is now of type QByteArrayData*. QFastMetaBuilder will be
ported to generate the new format, but for now it's sufficient to
reinterpret_cast the stringdata assignment to keep it compiling.

Change-Id: Ie340ef17bcebc3afa4aae6450dfe2d06e4d881a4
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
2012-03-13 12:58:48 +01:00
Matthew Vogt 0284817d6c Merge master <-> api_changes
Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
2012-03-05 11:39:54 +10:00
Matthew Vogt b855240b78 Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.

Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.

Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-24 04:51:31 +01:00
Matthew Vogt 01dc7e2ea4 Remove QtQuick1 elements from qtdeclarative
QtQuick1 is now contained in a separate repository.

Task-number: QTBUG-23737
Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
2012-02-03 00:39:18 +01:00
Jason McDonald 45b14259fc Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.

Change-Id: If39bd256b0fa85eba17ea30f8ab87ea27d758908
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-30 23:52:43 +01:00
Jason McDonald e6b224aa28 Update obsolete contact address.
Replace Nokia contact email address with Qt Project website.

Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-01-23 06:28:53 +01:00
Jason McDonald da0839735c Update copyright year in license headers.
Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-01-05 09:12:53 +01:00
Christian Kamm 86ca326d9f qmlplugindump: Don't depend on qtquick1 and widgets.
Change-Id: I38baaf2d8d02c3f35d2dece9fc580c6e1fee872d
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-12-09 11:47:09 +01:00
Christian Kamm 8c82a7bade qmlplugindump: Fix dumping of extended QGraphicsWidget.
Change-Id: Id574b4ee98f7d985ef06619956b2c02cac68b553
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-12-08 14:22:57 +01:00
Kent Hansen 6c8378eaf1 Say hello to QtQuick module
This change moves the QtQuick 2 types and C++ API (including
SceneGraph) to a new module (AKA library), QtQuick.

99% of this change is moving files from src/declarative to
src/quick, and from tests/auto/declarative to
tests/auto/qtquick2.

The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to
a plugin, src/imports/qtquick2, just like it's done for QtQuick 1.

All tools, examples, and tests that use QtQuick C++ API have gotten
"QT += quick" or "QT += quick-private" added to their .pro file.

A few additional internal QtDeclarative classes had to be exported
(via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the
QtQuick 2 implementation.

The old header locations (e.g. QtDeclarative/qquickitem.h) will
still be supported for some time, but will produce compile-time
warnings. (To avoid the QtQuick implementation using the
compatibility headers (since QtDeclarative's includepath comes
first), a few include statements were modified, e.g. from
"#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".)

There's a change in qtbase that automatically adds QtQuick to the
module list if QtDeclarative is used. Together with the compatibility
headers, this should help reduce the migration pain for existing
projects.

In theory, simply getting an existing QtDeclarative-based project
to compile and link shouldn't require any changes for now -- but
porting to the new scheme is of course recommended, and will
eventually become mandatory.

Task-number: QTBUG-22889
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-12-02 14:18:20 +01:00
Christian Kamm 409aecbe1e qmlplugindump: Avoid reporting types as attaching to themselves.
Task-number: QTCREATORBUG-6625
Change-Id: I9f778757b490cb5d79249b92f8c7b6d9d1df66e6
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-29 11:31:50 +01:00
Christian Kamm 774eebf997 qmlplugindump: Fix QObject dump.
* Hide deleteLater and the destroyed signal.
* Add destroy and toString functions.

Task-number: QTCREATORBUG-4903
Change-Id: Icbae3e1c82605baa84ac9cc8f38cd747e4dcf687
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2011-11-22 12:16:13 +01:00
Christian Kamm fb3851edd0 qmlplugindump: Fix dumping empty names for generated QMetaObjects.
Task-number: QTCREATORBUG-6543
Reviewed-by: Roberto Raggi

Change-Id: I2e85432ea8ff84ea4172e462782c0484ed75dcde
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2011-11-17 13:58:29 +01:00
Christian Kamm 8482c9d176 qmlplugindump: Add flush to fix output redirection on windows.
Task-number: QTCREATORBUG-5825
Change-Id: I26c2ecb77a89b352de97c70ff17fd076872a636b
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-11-03 11:39:25 +01:00
Christian Kamm f4130410d3 qmlplugindump: Dump QObject based module api.
Change-Id: Icc18392f63cd505e0264567e6c7d2d4cf7dac021
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-10-28 07:27:03 +02:00
Kent Hansen bfb3c424ab Rename Qt Quick-specific classes to QQuick*
The QSG (SceneGraph) prefix is too generic for
Qt Quick(2)-specific classes.

All the classes and files in the declarative/items
directory have been renamed.

In particular, for classes that are currently public,
the renaming is as follows:

QSGView --> QQuickView
QSGCanvas --> QQuickCanvas
QSGItem --> QQuickItem
QSGPaintedItem --> QQuickPaintedItem

The header files have been renamed accordingly
(e.g. qsgview.h --> qquickview.h).

Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-10-21 11:53:26 +02:00
Andrew den Exter c825865cdd Add DropArea item and Drag attached property.
Refactors drag API to improve compatibility with traditional drag and
drop by reusing events and adding drop actions.

Event sending is removed from MouseArea, instead the Drag object can
be attached to the item that is dragged and it will send drag events
when the position of that item is changed or when its active
property changes.

The DragTarget item is renamed to DropArea and can now communicate
supported and suggested actions.

Task-number: QTBUG-19747
Change-Id: I46cb77e68cf1ff32bbcbf0945facb593c9c2243c
Reviewed-on: http://codereview.qt-project.org/4638
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-10-10 05:48:01 +02:00
Christian Kamm a6393f953e qmlplugindump: Don't dump implicit signals.
Every property automatically has a xyzChanged signal anyway.

Change-Id: I470875a94792c0fc5a6378c8be1e0eddc24a1d5a
Reviewed-on: http://codereview.qt-project.org/6144
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-10-06 12:19:51 +02:00
Christian Kamm 121c32b54a qmlplugindump: Explicitly add QSGMouseEvent to be dumped.
Change-Id: I93f29f151e82a3d47fb10ff587fe28ea27a2d7b4
Reviewed-on: http://codereview.qt-project.org/6143
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-10-06 12:19:43 +02:00
Kent Hansen bcc9a4b3d1 Remove more QByteArray<->QString conversions
Prefer to store types as QStrings. It's only when we manipulate
raw (compiled, meta-)data that utf conversion is needed.

Change-Id: Ie138a69c9a409804e1b90b21c1d60dedea35bddb
Reviewed-on: http://codereview.qt-project.org/5781
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-09-29 14:59:15 +02:00
Christian Kamm 26e15e877f qmlplugindump: Describe meta object revisions of exported types.
Adds the exportMetaObjectRevisions property to generated qmltypes files.

Change-Id: Iafe2fe408c88bb6dd02cbb558404a5f654431248
Reviewed-on: http://codereview.qt-project.org/5311
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-09-21 15:28:01 +02:00
Gunnar Sletta 7147835237 Merge branch 'master' into refactor
Conflicts:
	src/3rdparty/v8
	src/declarative/declarative.pro
	src/declarative/items/qsgcanvas.cpp
	src/declarative/items/qsgshadereffectsource_p.h
	src/declarative/items/qsgview.cpp
	src/declarative/particles/qsgcustomparticle.cpp
	src/imports/gestures/gestures.pro
	src/imports/particles/particles.pro
	src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
	src/qtquick1/qtquick1.pro
	tests/auto/declarative/examples/examples.pro
	tests/auto/declarative/qsglistview/qsglistview.pro
	tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro

Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
2011-08-31 08:55:16 +02:00
Christian Kamm 438639f9c4 qmlplugindump: Load QtQuick 1 plugin.
This allows the QtQuick1 types to be dumped with --builtin and to be
skipped when dumping other plugins that use them.

Change-Id: I23ecba5cea7c11e998861746f1c7056e8911abf3
Reviewed-on: http://codereview.qt.nokia.com/3650
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2011-08-29 08:26:23 +02:00
Gunnar Sletta a61337b33a Compile with refactor
Change-Id: I41119370bd4823dcdfe5d4e2521d18b8d6ba8be3
Reviewed-on: http://codereview.qt.nokia.com/2417
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-01 07:33:56 +02:00
Christian Kamm 5d1eddc6cf qmldump: Fix creation of objects from QDeclarativeTypes.
Previously, the import statement was not necessarily set up correctly
for the type we wanted to instantiate. We simply use
QDeclarativeType::create now and thus can skip finding the right import.

Mirrors qtcreator/f326bd067d455e979b5d83195e19581a9e2fd494
Mirrors qt4.8/bdbc3ff0a32bb37a32dc4825413e60f9d75e5007

Change-Id: Ic9e652b341854941c0e6a51f49f23dfaae4f87d7
Reviewed-on: http://codereview.qt.nokia.com/1648
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-07-20 03:25:59 +02:00
Martin Jones 4442dea01b Extract all QtQuick 1 elements into a separate library/plugin.
Change-Id: I41a280de2739ee08202f4be2519e5012870090f2
Reviewed-on: http://codereview.qt.nokia.com/1391
Reviewed-by: Martin Jones <martin.jones@nokia.com>
2011-07-12 06:38:09 +02:00
Jyri Tahtela 5a705d8951 Update licenseheader text in source files for qtdeclarative Qt module
Replace old license header with correct one.

Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10
Reviewed-on: http://codereview.qt.nokia.com/1312
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
2011-07-08 02:45:03 +02:00