5 years agoSpecify better increment for captured properties
Alan Alpert [Sat, 8 Dec 2012 19:03:03 +0000 (11:03 -0800)]
Specify better increment for captured properties

There aren't that many captured properties, decreasing the increment
will give better performance.

Change-Id: Iddb17c695eda5513f2d038123f4c886e559d8f6a
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
5 years agotest: Mark tst_qdeclarativetext as insignificant
Sergio Ahumada [Tue, 18 Dec 2012 14:26:38 +0000 (15:26 +0100)]
test: Mark tst_qdeclarativetext as insignificant

Task-number: QTBUG-21015
Change-Id: I5b0f3a607c182aec819bd525ce3b2a4f8b47791a
Reviewed-by: Alan Alpert <aalpert@rim.com>
5 years agoAdd minimal plugin importing to quick1 qmlplugindump tool v5.0.0
Miikka Heikkinen [Wed, 12 Dec 2012 11:22:45 +0000 (13:22 +0200)]
Add minimal plugin importing to quick1 qmlplugindump tool

Task-number: QTBUG-28131

Change-Id: I9d38b7f2ec94dfd084e2ce23412c4a8348ffe7b4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoDoc: Added documentation for the quick1 demo applications v5.0.0-rc2
Venugopal Shivashankar [Tue, 11 Dec 2012 17:40:56 +0000 (18:40 +0100)]
Doc: Added documentation for the quick1 demo applications

Change-Id: Iebc7c1e7202fed95abf231913b48cec75675e7f1
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoBackport PathView currentIndex fixes from Qt 5
Bea Lam [Tue, 11 Dec 2012 07:25:44 +0000 (17:25 +1000)]
Backport PathView currentIndex fixes from Qt 5

Backport 447e5acb880ebda498891623dc4009984cb73bc6 and
0fc361f96b06ba318e70610e46beb421753cae9d which fix bugs related
to currentIndex. The first commit ensures currentIndex=0 when all
items are removed; the second ensures that the initial currentIndex
value is respected and also resets the view correctly if the model

Change-Id: I73266a211001a54163be8415d449802ff077a72e
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
5 years agoFixed install path of tictactoe example
Oliver Wolff [Tue, 11 Dec 2012 09:59:07 +0000 (10:59 +0100)]
Fixed install path of tictactoe example

Change-Id: I710152e833a74956060772d5e01772dea0298384
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoProcess imports in the order they appear in the code.
Robin Burchell [Wed, 5 Dec 2012 01:12:30 +0000 (02:12 +0100)]
Process imports in the order they appear in the code.

By placing imports into a hash keyed by the qualifier, imports were not
processed in the order they appeared in the source. This is perhaps not a major
problem, but it is nice to have predictability.

This becomes more important in Qt 5, when QHash is randomly seeded at
application startup, as alterations to order could have strange side effects on

Reported-by: Maciej Blomberg
Change-Id: Ibd34fab1eed4bc727b498ba4684c62d801ae713b
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoFix crash when mapping coordinates to & from the root item.
Nicolas Tisserand [Sun, 9 Dec 2012 14:07:01 +0000 (15:07 +0100)]
Fix crash when mapping coordinates to & from the root item.

The crash triggered by our (supported & documented) use-cases (calling
map{From,To}Item with a null value), has been introduced earlier this year,
by this change:


 * Clarify QDeclarativeItem::map{From,To}Item statement ordering.
 * Handle the engine-less item corner case.

Change-Id: I33678f7267a4b624bfa61247a643f37ad2ec735d
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
5 years agoDo not build Qt Quick 1 documentation and example manifest.
hjk [Tue, 11 Dec 2012 15:15:48 +0000 (16:15 +0100)]
Do not build Qt Quick 1 documentation and example manifest.

It was decided to leave in the examples as reference, but
not obviously refer to them in the documentation.

Change-Id: I932a2a3fc983d5a8a63855ae94d509161fdfada4
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agocentralize and fixup example sources install targets
Oliver Wolff [Wed, 5 Dec 2012 10:42:20 +0000 (11:42 +0100)]
centralize and fixup example sources install targets

follow respective change in qtbase

Change-Id: I15346e16cd1d6f30cf32a77284b5f19b1dd2a7a9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
5 years agomake use of qt_headersclean.prf
Oswald Buddenhagen [Mon, 3 Dec 2012 20:43:42 +0000 (21:43 +0100)]
make use of qt_headersclean.prf

Change-Id: I55d94c152217e419a2c8f04d174996a71eb933a5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoMake sure Q_DECLARE_METATYPE is used in all TUs it is registered in.
Stephen Kelly [Tue, 11 Dec 2012 14:47:27 +0000 (15:47 +0100)]
Make sure Q_DECLARE_METATYPE is used in all TUs it is registered in.

Change-Id: I0aea3bfcae77d22f04166ce7e04c9a4898e7f99b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoFix typo in metatype registration.
Stephen Kelly [Tue, 11 Dec 2012 14:55:52 +0000 (15:55 +0100)]
Fix typo in metatype registration.

Change-Id: If0fd01464160259d634770908d5c284db2bbe582
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoAdd qtdeclarative.qdocconf to get a example_manifest.xml
hjk [Tue, 11 Dec 2012 09:47:50 +0000 (10:47 +0100)]
Add qtdeclarative.qdocconf to get a example_manifest.xml

Change-Id: I52b87947559c10d3e60af81fe8d4f3189dd1614e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoAdd PLUGIN_CLASS_NAME to qtquick1 plugins
Miikka Heikkinen [Mon, 10 Dec 2012 12:42:40 +0000 (14:42 +0200)]
Add PLUGIN_CLASS_NAME to qtquick1 plugins

Needed for automating static plugin loading.

Task-number: QTBUG-28131
Change-Id: Ia32d3dad2136d0fda468a538fe9be989e72c79eb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoStabilize tst_qdeclarativetimer
Alan Alpert [Wed, 5 Dec 2012 20:36:49 +0000 (12:36 -0800)]
Stabilize tst_qdeclarativetimer

Use consistent timing on the unified timer instead of qWait

Manual cherry-pick of 2ebb2fce87642ef0da8629bdb27164fffbdcdcb9
Change-Id: I76c402081062f7f6849bd421e90bc96f08e8d95a
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agoRemove 'com/nokia' string from autotest
Alan Alpert [Wed, 5 Dec 2012 19:47:09 +0000 (11:47 -0800)]
Remove 'com/nokia' string from autotest

Missed this bit in commit 905537e032095790b4ac1607c5ca0de2ad412476

Change-Id: Ic318dbe7a48412e9689ca0f4506c7098d9f48b6a
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
5 years agoDoc: Added documentation for the Qt Quick1 examples
Venugopal Shivashankar [Tue, 4 Dec 2012 16:26:27 +0000 (17:26 +0100)]
Doc: Added documentation for the Qt Quick1 examples

Task-number: QTBUG-27515

Change-Id: I7a38158e44e69ac151842a0a49865fe72224ece8
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoremove unnessary reference to QGuiApplication v5.0.0-rc1
Jing Bai [Tue, 4 Dec 2012 18:39:01 +0000 (19:39 +0100)]
remove unnessary reference to QGuiApplication

In QDeclarativeEngine initialization,it goes through all types,
including Font in Gui. This causes a crash when using
QDeclarativeEngine with QCoreApplication.

Task-number: QTBUG-28375
Change-Id: Idce2a046db7e52a1c13b8c5c0315e36873f7e27d
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
5 years agoRemove 'com.nokia' string from autotest
Alan Alpert [Tue, 4 Dec 2012 23:48:03 +0000 (15:48 -0800)]
Remove 'com.nokia' string from autotest

Change-Id: Ic318dbe7a48412e9689ca0f4506c7098d9f48b5f
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
5 years agosync.profile: Point dependencies to 'refs/heads/stable'
Sergio Ahumada [Tue, 4 Dec 2012 10:32:00 +0000 (11:32 +0100)]
sync.profile: Point dependencies to 'refs/heads/stable'

We should test stable branches against stable branches only.
At some point we should automate the merges from dev->stable->release
and decide how to handle possible merge conflicts.

This is good enough for the time being.

Change-Id: Ic8e80a8db60c8fae950e1327bc8ac66c1940872d
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
5 years agoremove symbian & maemo5 vestiges
Oswald Buddenhagen [Mon, 3 Dec 2012 20:43:28 +0000 (21:43 +0100)]
remove symbian & maemo5 vestiges

Change-Id: I4c02f91abde94d9ee7d154efa6eb371e1a8dfd71
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
5 years agoEngineDebug: Updated and renamed service
Aurindam Jana [Fri, 28 Sep 2012 13:01:08 +0000 (15:01 +0200)]
EngineDebug: Updated and renamed service

Updated service to include parent ids. Since this
will break client compatibility, the service
has been renamed to 'DeclarativeDebugger' from
'QDeclarativeEngine'. This is effectively a backport
of the 'QmlDebugger' service from Qt5.

Change-Id: I7e3c9b9c321278dd24bd17ae2efdc690307cba8a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoLimit case-sensitivity check in QML to file names.
Friedemann Kleint [Fri, 30 Nov 2012 09:38:57 +0000 (10:38 +0100)]
Limit case-sensitivity check in QML to file names.

Provide for checking relative paths only; default to file names.
Currently, the checking triggers on a drive letters and
installation folder names, which is too strict.

Task-number: QTBUG-28277
Change-Id: I2056a39b605f7891d2c3e395efc6bc541aa7e470
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoMark randomly failing test as insignificant
Lars Knoll [Fri, 30 Nov 2012 10:05:15 +0000 (11:05 +0100)]
Mark randomly failing test as insignificant

Change-Id: Ie78eda64966b6d594123db91f908e3c84b1966b6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agoQml1PluginDump: Prevent crash if run without WM
Kai Koehne [Fri, 30 Nov 2012 10:05:49 +0000 (11:05 +0100)]
Qml1PluginDump: Prevent crash if run without WM

Make sure that the minimal platform plugin is used by default.

Change-Id: I32f5ae128f2134f8955d4bdb14974059b98209eb
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoFix QML XmlHttpRequest Insecure Redirection Flaw
Richard Moore [Fri, 30 Nov 2012 11:21:15 +0000 (11:21 +0000)]
Fix QML XmlHttpRequest Insecure Redirection Flaw

Fix the redirection flaw in QML's XmlHttpRequest implementation that
is described in

Change-Id: I5190e63648f4664753003b70c20cb8dbd20ab150
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoMake tst_examples::namingConvention not fail
Kai Koehne [Fri, 30 Nov 2012 11:48:50 +0000 (12:48 +0100)]
Make tst_examples::namingConvention not fail

The test seems to be wrong. Keep the warning though if other
tests actually rely on the behavior.

Task-number: QTBUG-28271
Change-Id: I93b952156b96b5d07ab5177ffce6152e77479c2d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agoRename focus document to make it clear it's not for QML in general
Shawn Rutledge [Fri, 30 Nov 2012 14:41:34 +0000 (15:41 +0100)]
Rename focus document to make it clear it's not for QML in general

Old doc for Qt Quick 1, and qtdeclarative module has its own
modified copy already.

Change-Id: I5b6c10be59dd4948ba21a2e03f2a61cebf541fcb
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
5 years agoFix tst_qdeclarative build
Simon Hausmann [Fri, 30 Nov 2012 16:57:51 +0000 (17:57 +0100)]
Fix tst_qdeclarative build

Change-Id: Ifb326e09a5254d1518d7d18c1994b36c349bdeb6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 years agoQtQuick1: Add generated .qmltypes
Kai Koehne [Tue, 18 Sep 2012 14:04:55 +0000 (16:04 +0200)]
QtQuick1: Add generated .qmltypes

Change-Id: I4970676013d374db528c693375dd9ba2a3108908
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
5 years agoEnsure QDeclarativeTextLayout uses the correct pen
Chris Adams [Tue, 27 Nov 2012 02:26:53 +0000 (12:26 +1000)]
Ensure QDeclarativeTextLayout uses the correct pen

When a styled text specifies a font region with some color set,
QDeclarativeTextLayout used to revert to using a default-constructed
(black-colored) pen for text occurring after the </font> tag, rather
than the "default" (property-defined) color.

This commit ensures that the correct pen is used, by setting the pen
of the "inert" painter to be an invalid color rather than a default
constructed pen.  It then detects when the current pen transitions
back to this invalid pen, and switches back to using the default

Task-number: QTBUG-28135
Change-Id: I6bcc43fbcf7fb2c680959d27b1422364ebb473ae
Reviewed-by: Alan Alpert <aalpert@rim.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
5 years agoObserve GL context loss in ShaderEffectItem
Chris Adams [Tue, 27 Nov 2012 01:05:48 +0000 (11:05 +1000)]
Observe GL context loss in ShaderEffectItem

Recreate the shader program as required when the GL context
changes. Also delete the shader program when the ShaderEffectItem
is deactivated, to save graphics memory.

Previously, this was done only for Symbian platforms, and in a
suboptimal fashion. This patch implements the behaviour for all
platforms in a more optimal manner.

Task-number: QTBUG-28136
Change-Id: I8281e77f7285ea0046bdf092ab827cae3b00a6d2
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Alan Alpert <aalpert@rim.com>
5 years agoThe LGPL license info should refer only to Qt Declarative
Lars Knoll [Tue, 27 Nov 2012 11:26:18 +0000 (12:26 +0100)]
The LGPL license info should refer only to Qt Declarative

Qt Quick (2) is not using Qt Script and thus not bound
to LGPL terms.

Change-Id: I2ec2e361563bff0e27f85c6273e6cfa38a3759ae
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
5 years agoQML file loading: honor synchronous requests made through QNAM
Alan Alpert [Mon, 26 Nov 2012 21:29:32 +0000 (13:29 -0800)]
QML file loading: honor synchronous requests made through QNAM

So that it can skip loading state when the underlying
QNetworkReply is already finished.

Change-Id: Ic2d26271868b64bf8a411b4b54d7e5be7ee5d2b5
Parts-of-the-patch-by: Jeremy Nicholl
Task-number: QTBUG-27723
Reviewed-by: Alan Alpert <aalpert@rim.com>
5 years agoQtQuick1: Fix ObserverMode
Aurindam Jana [Thu, 22 Nov 2012 16:29:53 +0000 (17:29 +0100)]
QtQuick1: Fix ObserverMode

Although ObserverMode was enabled, the messages to the plugin
were not delivered and hence the feature did not work.

Change-Id: I58ec83a4ee727b32833c011a4942cde0cd6a02c8
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
5 years agoQml1PluginDump: Fix dumping of GUI types
Kai Koehne [Mon, 26 Nov 2012 14:31:10 +0000 (15:31 +0100)]
Qml1PluginDump: Fix dumping of GUI types

Make sure that Gui types are dumped to for -builtins. For
QGuiApplication / type() == QApplication::Tty they weren't registered
otherwise (change e5b200fa06e).

Task-number: QTBUG-28206
Change-Id: Ia6c0902f465ece5411a37b9c23b390172dc58f4b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
5 years agoAccept missing semicolon after do-while statement.
Erik Verbruggen [Mon, 26 Nov 2012 09:43:17 +0000 (10:43 +0100)]
Accept missing semicolon after do-while statement.

Although not valid according to ECMA 5.1, both JSC and V8 accept a
missing semicolon after a do-while loop. (Both JSC and V8 do not do this
through automatic semicolon insertion, but handle it as a special case.)

This is a "port" of a similair change done in the qtdeclarative module.

Change-Id: I417cf18abb75e7040c48894b8f8f68afc41547fe
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoCompile with QT_NO_CLIPBOARD
Andrew den Exter [Mon, 26 Nov 2012 00:24:13 +0000 (10:24 +1000)]
Compile with QT_NO_CLIPBOARD

Change-Id: Icfc2b14b1e5ff5eab5fd4af3a6ffbebea6f89e84
Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
5 years agoPort TextInput/TextEdit clipboard optimizations from QtQuick 2.0
Andrew den Exter [Thu, 22 Nov 2012 01:11:29 +0000 (11:11 +1000)]
Port TextInput/TextEdit clipboard optimizations from QtQuick 2.0

Don't check if the clipboard has content until necessary as the
check can block for an extended period.

Port of 3db5afa71443533eee6825a5fb0da29498f96b94 from qtdeclarative.

Change-Id: I606af79cbf10b147aa1bb6c182b0a84aabbc5257
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
5 years agomake use of qml1_plugin.prf
Oswald Buddenhagen [Fri, 26 Oct 2012 13:44:04 +0000 (15:44 +0200)]
make use of qml1_plugin.prf

Change-Id: I0d0147592e981ef5c6543d50aa5c2cb355268553
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoRemove references to QApplication::type()
J-P Nurmi [Thu, 22 Nov 2012 10:39:13 +0000 (11:39 +0100)]
Remove references to QApplication::type()

Qt3 legacy QCoreApplication::Type and QApplication::type() will be
removed -> use qobject_cast instead.

Change-Id: If95a5552440ace2592332de03f9d2240fa8770b9
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoFix building of examples.
Friedemann Kleint [Thu, 22 Nov 2012 13:38:19 +0000 (14:38 +0100)]
Fix building of examples.

- Correct install paths.
- Add missing subdir-.pro files.
- Add missing resources.

Task-number: QTBUG-27977
Change-Id: Ia8293cbaa7b32280181f41bde5b6e517989571f8
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoFix syncqt-warnings about missing QT_BEGIN_HEADER/NAMESPACE.
Friedemann Kleint [Tue, 20 Nov 2012 10:31:24 +0000 (11:31 +0100)]
Fix syncqt-warnings about missing QT_BEGIN_HEADER/NAMESPACE.

Change-Id: I42532f6896ff9fe91084e2e1c8aa53a00527329b
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
5 years agoFix Snake demo
Alan Alpert [Tue, 20 Nov 2012 17:47:18 +0000 (09:47 -0800)]
Fix Snake demo

The runtime object is only exposed by qmlviewer. As the demo was changed
to run from an executable instead, it no longer has access to this

Change-Id: I329342ac8f49c52331f9558111cb192e08bd89da
Reviewed-by: Peter Hartmann <phartmann@rim.com>
5 years agoMove the Qt Quick 1 imports back to "imports"
Thiago Macieira [Sat, 13 Oct 2012 22:44:14 +0000 (15:44 -0700)]
Move the Qt Quick 1 imports back to "imports"

The Qt Quick 2 ones will be in a different place. This restores Qt 4

Change-Id: I6bc11113c0c89f4b11422b7fe98571930eb852cd
Discussed-on: http://lists.qt-project.org/pipermail/development/2012-October/007011.html
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoExamples: Removed Symbian and MeeGo examples.
Jerome Pasion [Mon, 12 Nov 2012 15:54:31 +0000 (16:54 +0100)]
Examples: Removed Symbian and MeeGo examples.

Those platforms are not in scope for Qt 5.0

Change-Id: I70ee233ddfea3d15dc8a3e7d6cc6b1b43f1c7ba6
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
5 years agoSeparate qtquick1 example install paths from qtdeclarative examples v5.0.0-beta2
Topi Reinio [Mon, 5 Nov 2012 10:08:56 +0000 (11:08 +0100)]
Separate qtquick1 example install paths from qtdeclarative examples

After QtQuick1 -> QtDeclarative name change (79fed875), the examples
both in qtquick1 and qtdeclarative use the same install path, causing

This change restores the install path used by qtquick1 examples as
its own subdirectory under QT_INSTALL_EXAMPLES.

Task-number: QTBUG-27823
Change-Id: Ica9ab8c5984642ace934e694cba346bcd3a1cb4c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoUpdated QmlApplicationViewer for QtQuick1 examples
Topi Reinio [Thu, 18 Oct 2012 10:53:27 +0000 (12:53 +0200)]
Updated QmlApplicationViewer for QtQuick1 examples

    - Copy the latest QmlApplicationViewer from qt-creator (4eedda04)
    - Include deployment.pri in qmlapplicationviewer.pri
    - Reorganize deployment.pri so that INSTALLS is generated for all
      plaforms (No INSTALLS was generated for non-unix platforms)
    - Remove Symbian-specific remnants (CAPABILITY, EPOCHEAPSIZE)

Task-number: QTBUG-26197
Change-Id: I329342ac8f49c52331f9558111cb192e08bd89d4
Reviewed-by: Leonard Lee <leonard.lee@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agofollow qt_tool.prf now setting up DESTDIR
Oswald Buddenhagen [Fri, 26 Oct 2012 18:02:51 +0000 (20:02 +0200)]
follow qt_tool.prf now setting up DESTDIR

Change-Id: I875fb9563af10f51bb3d51950bc376f44a8f38db
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoadjust to qt_plugin.prf changes
Oswald Buddenhagen [Wed, 24 Oct 2012 13:36:50 +0000 (15:36 +0200)]
adjust to qt_plugin.prf changes

DESTDIR and INSTALLS+=target are set up automatically now, but
PLUGIN_TYPE needs to be defined.
some other setup can be skipped as well.

Change-Id: If6e77a42a571e1977875b13bc8519a2cd43df16a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoCMake: Remove obsolete test_modules test
Stephen Kelly [Wed, 31 Oct 2012 13:56:17 +0000 (14:56 +0100)]
CMake: Remove obsolete test_modules test

The generated module_includes test is a super-set of this test.

Change-Id: I9faca7c8eb171c99e2033aa7cddc923aedf13507
Reviewed-by: Rohan McGovern [inactive] <rohan.mcgovern@nokia.com>
5 years agoCMake: Test module includes
Stephen Kelly [Mon, 29 Oct 2012 14:20:31 +0000 (15:20 +0100)]
CMake: Test module includes

Change-Id: Ie02cabb3081be394242f8d1fa06ecf7946c4bdc0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoFix crash in GridView
Thomas Hartmann [Tue, 23 Oct 2012 11:49:26 +0000 (13:49 +0200)]
Fix crash in GridView

QDeclarativeGridView crashed in the WelcomeScreen of Qt Creator.
For details refer to the task.

Task-number: QTBUG-23445

Change-Id: I44594a253a004db254e8cd87560de3f0824a94bf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
5 years agoFix QDeclarativeTextInput::moveCursorSelection()
Konstantin Ritt [Mon, 15 Oct 2012 08:27:09 +0000 (11:27 +0300)]
Fix QDeclarativeTextInput::moveCursorSelection()

by using fixed QTextBoundaryFinder behavior.
Update QDeclarativeTextInput autotests.

Task-number: QTBUG-11365
Task-number: QTBUG-27364

Change-Id: Idda22f6c0974bf29d2ff961ea8d998a68c3d676b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoAdapt to WebKit module changes
Simon Hausmann [Mon, 15 Oct 2012 13:00:58 +0000 (15:00 +0200)]
Adapt to WebKit module changes

QtQuick1 uses the Widgets related API of QtWebKit and hence needs
to use the QtWebKitWidgets module.

Change-Id: Idf2e65d053e1dbf2501486c8f0a22b8b25f23efc
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
5 years agoChange the header message: this is now the QtDeclarative module
Thiago Macieira [Tue, 25 Sep 2012 12:08:22 +0000 (14:08 +0200)]
Change the header message: this is now the QtDeclarative module

Change-Id: I18a370a58494049939d035f1c3528406f3f7645f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoRevert "Temporarily disable WebKit as build dependency for QtQuick1"
Simon Hausmann [Thu, 18 Oct 2012 12:14:58 +0000 (14:14 +0200)]
Revert "Temporarily disable WebKit as build dependency for QtQuick1"

This reverts commit 049ca9aa5e5d6bbcf2a68be6772327a4b6ab3aa0

WebKit should be fixed now and this was supposed to be a temporary move only.

Change-Id: I1e3adb55ed5b98e437b45cbc9c6f7e7f9eeb85a9
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
5 years agoChange qtdeclartive tst_examples autotest to use qWaitForWindowExposed.
Janne Anttila [Fri, 19 Oct 2012 06:57:30 +0000 (09:57 +0300)]
Change qtdeclartive tst_examples autotest to use qWaitForWindowExposed.

The QtDeclartive tst_examples autotest has been flaky. After some
investigation I found that it has been using qWaitForWindowActive,
which basically means that window itself or it's child has taken focus.

When running tst_examples locally I found that some tested QML files
stay on screen for maximum time given for qWaitForWindowActive.
This probably happens because not all QML demos take focus. From Git
logs I also found that test case intially used qWaitForWindowShown
(15e48b7387ae302a1b07a57b8374b097dc9c96a4), but that was changed to
qWaitForWindowActive when qWaitForWindowShown was deprecated. Based on
documentation qWaitForWindowExposed should be used instead of


Switch qWaitForWindowActive to qWaitForWindowExposed to decrease
execution time of tst_examples in CI system and make tests to pass more

Change-Id: Id859b377e577c44e85216a5acb51e69fe9659699
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 years agoDo not use an export macro in the function definition
Thiago Macieira [Wed, 3 Oct 2012 22:07:59 +0000 (15:07 -0700)]
Do not use an export macro in the function definition

qmlExecuteDeferred is exported using Q_DECLARATIVE_EXPORT in
qdeclarative.h, so we don't need to use one here. Better not have any
than have the wrong one, which can cause problems.

Change-Id: I672f8aaf0fef2600a6ab8c4a17112404fc5b1cda
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoIncrease the timeout for the example window to 3s (up from 1)
Thiago Macieira [Wed, 17 Oct 2012 20:45:21 +0000 (13:45 -0700)]
Increase the timeout for the example window to 3s (up from 1)

The examples test is failing on different tests every time, so it's
likely to be a timing issue.

Change-Id: I3fc8826d1100dba8e62839eb7f8d67b5bda3b761
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
5 years agoQtQuick1: Make the examples test for QtQuick1 pass.
Friedemann Kleint [Wed, 17 Oct 2012 09:07:04 +0000 (11:07 +0200)]
QtQuick1: Make the examples test for QtQuick1 pass.

- Fix check to indicate immediate errors, skip the loading
  state and check for errors after loading again.
- Exclude all broken examples.
- Exclude Mac .app folders
- Fix the DeclarativeViewer to check for the presence
  of the ImageMagick and ffmpeg executables only once,
  reducing test time.
- Do not check for ImageMagick by running its command
  line tool 'convert' on Windows, since Windows
  has a tool of the same name that converts file
  systems (!).
- Fix doc snippets to load correctly.
- Introduce defines in case WebKit or XmlPatterns
  are not present (which existed in Qt 4).

Task-number: QTQAINFRA-428

Change-Id: Icc0a983bc42857b41ab1d9e93336f8265bfbec36
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoDo not use module-include in shader-plugin.
Friedemann Kleint [Mon, 8 Oct 2012 14:23:34 +0000 (16:23 +0200)]
Do not use module-include in shader-plugin.

Task-number: QTBUG-27471

Change-Id: I4f15e7358739ac6057798505af5ea4c171207f20
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoQtQuick1: Fix qmlviewer no longer showing file dialog.
Friedemann Kleint [Wed, 10 Oct 2012 08:19:59 +0000 (10:19 +0200)]
QtQuick1: Fix qmlviewer no longer showing file dialog.

Change-Id: I81588fbe7141fb1df0d56b2dec2e8d495af975a0
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
5 years agoQtQuick1: Introduce messages to some tests.
Friedemann Kleint [Wed, 10 Oct 2012 12:40:38 +0000 (14:40 +0200)]
QtQuick1: Introduce messages to some tests.

Change-Id: If95a85c8aaff359a35ae21549f0142e47cb0cc10
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoRename the QtQuick1 module back to QtDeclarative
Friedemann Kleint [Mon, 15 Oct 2012 13:58:44 +0000 (15:58 +0200)]
Rename the QtQuick1 module back to QtDeclarative

Matches the name that this code used to have in Qt 4.

- Adapt library, change import path to 'QtDeclarative'.
- Update the tests and examples to match the new library name.
- Rename qtquick1global{_p}.h to qtdeclarativeglobal.h.
- Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like
  it was in Qt 4 and matching the library name again. This also
  changes the include guards in qtdeclarativeglobal{,_p}.h.
- Fix occurrence of quick_debug in tools/qml/qml.pro.

Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoTemporarily disable WebKit as build dependency for QtQuick1
Simon Hausmann [Wed, 17 Oct 2012 12:27:25 +0000 (14:27 +0200)]
Temporarily disable WebKit as build dependency for QtQuick1

The CI system is having trouble building WebKit and in the meantime
let's build this module without to allow for the integration of unrelated

Change-Id: Ifbdf59863c8bc42b5912e2631649b68649254893
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoQPerformanceTimer: fixed wrong implementation of elapsedToAbsoluteTime()
Frantisek Vacek [Fri, 12 Oct 2012 12:31:59 +0000 (14:31 +0200)]
QPerformanceTimer: fixed wrong implementation of elapsedToAbsoluteTime()

Function elapsedToAbsoluteTime() had wrong implementation on MAC and WIN

Change-Id: Icc11e85bcd562cce42af902749883b433a1fcb0b
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
5 years agoFix quick1_debug -> declarative_debug
Sergio Ahumada [Sat, 13 Oct 2012 18:40:10 +0000 (20:40 +0200)]
Fix quick1_debug -> declarative_debug

This change was introduced in qtbase by abbecca7d484560111dfdbb894d48d253873018b

Change-Id: Ic04076e0925c8e2a7226caef4a008fd09a9d1216
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoQtQuick1: fixed qperformancetimer test
Christiaan Janssen [Fri, 28 Sep 2012 14:58:11 +0000 (16:58 +0200)]
QtQuick1: fixed qperformancetimer test

It wasn't included in the autotests, and did not compile due to missing defines in the makefile.

Change-Id: Ie1e3790422e6c1af2948b1edc38a72e2f8d543ed
Reviewed-by: Fanda Vacek <fvacek@rim.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
5 years agoQDeclarativeTrace patch for a custom trace instance
Frantisek Vacek [Fri, 28 Sep 2012 09:27:49 +0000 (11:27 +0200)]
QDeclarativeTrace patch for a custom trace instance

Needed for the BB10 Cascades profiling. There are more reasons for
introducing this patch:

1) Cascades do not use QtGui library for QML rendering. It has its own
paint engine with client-server architecture. Profiler traces are sent
asynchronously from non Qt renderer thread to the Qt client.
The QPerformanceTimer has to be patched too, cause we need to know time
difference between tracing zero time and some time in past,
see: qint64 QPerformanceTimer::elapsed(qint64 to_monotonic_time_ns) const

2) Since we need more sophisticated trace engine in cascades, this patch
allows explicitly assign custom class derived from QDeclaraqtiveDebugtrace
to the trace framework.
If no custom instance is assigned, the default QDeclarativeDebugTrace
instance is created implicitly on first trace request.
Using custom trace instance which is not part of Qt
(it is part of libbbcascades) allows us to implement all Cascades trace
special needs in libbbcascades and not to carry Qt with the platform
specific code.

allow custom trace engine only on the bleckberry platform,
see declarative.pro.
If this macro is defined Qt compiles from its original code.

4) Possibility of custom QDeclaraqtiveDebugTrace instance might be usable
for other projects which needs to extends somehow default Qt trace

5) Patch is not intended to be applied to Qt Quick 2, since declarative
debugging infrastructure is changed there.

Change-Id: I199211c1de66e930e252e8c033503d7f4940565f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
5 years agoAdd QtQuick1 WebKit integration (from QtWebKit module)
Simon Hausmann [Wed, 26 Sep 2012 08:49:56 +0000 (10:49 +0200)]
Add QtQuick1 WebKit integration (from QtWebKit module)

This adds the QML1 QDeclarativeWebView integration to the default build (it was
added a while ago) as well as the unit tests.

Change-Id: I7324f5a3b00716d4b300e8c11d9ea3b8b9577da3
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
5 years agoMark qtextdeclarativetextinput test as insignificant
Simon Hausmann [Thu, 27 Sep 2012 10:58:15 +0000 (12:58 +0200)]
Mark qtextdeclarativetextinput test as insignificant

Task-number: QTBUG-27364

Change-Id: I35d23837896a87be371712023388da14e8a228c5
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agoRemove qtXXXversion.h from gitignore
Thiago Macieira [Tue, 25 Sep 2012 12:21:02 +0000 (14:21 +0200)]
Remove qtXXXversion.h from gitignore

These files are not generated anymore

Change-Id: Idf470ff4775d0c9775a9df7c115d79f986444e8c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoChange copyrights from Nokia to Digia
Iikka Eklund [Mon, 24 Sep 2012 05:52:28 +0000 (08:52 +0300)]
Change copyrights from Nokia to Digia

Change copyrights and license headers from Nokia to Digia

Change-Id: I11a957e35758e821269478ebc91e87f0f5ebc4d5
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoRemove Symbian platform
Kai Koehne [Fri, 14 Sep 2012 13:33:20 +0000 (15:33 +0200)]
Remove Symbian platform

Change-Id: Iad770614f7c1c890febeee662d0ce9370dcb17e3
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
5 years agoqmlplugindump: Update help output
Kai Koehne [Mon, 17 Sep 2012 14:39:20 +0000 (16:39 +0200)]
qmlplugindump: Update help output

We dropped the 4.7 import a while ago.

Change-Id: I8ae8d11b890374c3ec6e87556a7de1f064d37f38
Reviewed-by: Christian Kamm <kamm@incasoftware.de>
5 years agoCompile & install qmlplugindump by default (again)
Kai Koehne [Mon, 17 Sep 2012 14:10:42 +0000 (16:10 +0200)]
Compile & install qmlplugindump by default (again)

qmlplugindump is still needed for QtQUick1 modules, since the one in
qtdeclarative will choke on the QtQuick1 dependency. Therefore revive
qmlplugindump in here, but name it qml1plugindump.

Change-Id: I975621cff4758ab71e165eb3f6398d70a1f154be
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoUse qInstallMessageHandler
Kai Koehne [Thu, 13 Sep 2012 12:47:47 +0000 (14:47 +0200)]
Use qInstallMessageHandler

qInstallMsgHandler got deprecated in Qt 5.

Change-Id: I87f5f8d5b28afcbcf8a9c613d1d4b1199f5f4254
Reviewed-by: Martin Jones <martin.r.jones@gmail.com>
5 years agocentralize load(qt_build_config)s in .qmake.conf
Oswald Buddenhagen [Mon, 3 Sep 2012 10:11:27 +0000 (12:11 +0200)]
centralize load(qt_build_config)s in .qmake.conf

Change-Id: I627dfef54743821d0c3019034f114ac4d81fda76
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
5 years agoqmlplugindump: Fix compilation again
Kai Koehne [Fri, 7 Sep 2012 16:12:27 +0000 (18:12 +0200)]
qmlplugindump: Fix compilation again

Apply changes done to qtdeclarative/qmlplugindump here, too.

Change-Id: I55c99fb0ad499c5cb59dda33e320702c0d4722ea
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
5 years agoAvoid usage of deprecated QInputMethod::inputItem() in tests
Pekka Vuorela [Mon, 3 Sep 2012 13:58:03 +0000 (16:58 +0300)]
Avoid usage of deprecated QInputMethod::inputItem() in tests

Change-Id: Ie6e37ab23b1bef99d294fe8a0acd95429a37a527
Reviewed-by: Joona Petrell <joona.petrell@gmail.com>
5 years agoCompile without xmlpatterns again.
Daniel Molkentin [Wed, 5 Sep 2012 19:08:41 +0000 (21:08 +0200)]
Compile without xmlpatterns again.

Change-Id: I1cb9d92c60e8595432c1a13866c370e040553a6f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoRegister Qt 4.7 import on-demand, instead of at startup.
Robin Burchell [Sat, 1 Sep 2012 11:57:32 +0000 (13:57 +0200)]
Register Qt 4.7 import on-demand, instead of at startup.

This is a slightly less awkward approach (keeps backwards-compatibility) while
speeding up startup for applications that don't use the old import path.

Also prints a warning to let developers know they should migrate their code when
possible. Completely disabling the Qt 4.7 import is still possible by setting

This takes around 10-15ms off a very simple "hello world" on my macbook.

As an added bonus, forward-port a similar approach to 4.8's
a26f545d8e25af74fb43d16c9afa79f6e04463e7 and don't register graphical types in a
non-graphical application as someone (very naughtily) apparently forgot to get
it integrated to Qt 5 first.

Change-Id: I7821523750b3ab6770f367788725d0da70c5ec1f
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Alan Alpert <416365416c@gmail.com>
5 years agoUpdate the git-archive export options
Thiago Macieira [Wed, 29 Aug 2012 19:40:04 +0000 (21:40 +0200)]
Update the git-archive export options

The .gitattributes and .gitignore files do not need to be present in
packaged sources, as they are for people using the Git repository.
People who download tarballs usually don't reimport into Git -- they
should just download the actual repositories.

Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the $n string, ask git-archive to store
the SHA-1 of the commit being packaged.

Change-Id: I05ad98586d5ce38bb499d7bb4a4d09ee81cefd4b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agoUse CONFIG+=quick1_debug in pro files to activate debugging v5.0.0-beta1
Kai Koehne [Fri, 24 Aug 2012 09:07:22 +0000 (11:07 +0200)]
Use CONFIG+=quick1_debug in pro files to activate debugging

Change-Id: I63cc45662e8f1ac5979ac8cf2ba8c76b42c45895
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
5 years agoUnskip test that's no longer failing
Kent Hansen [Wed, 22 Aug 2012 08:02:03 +0000 (10:02 +0200)]
Unskip test that's no longer failing

This reverts commit 504ba059df18c524fa8199084791f3b792b2104e.

The test was failing due to a regression in qtscript that's now
been fixed (commit 9429a85a2160cf8b860b1292e4e0bc0855841755).

Task-number: QTBUG-26889
Change-Id: If7a417d4d3f67a853ffde1033ab2ae9e43f44a2c
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
5 years agoUse Qt::WindowFlags, not Qt::WFlags.
Stephen Kelly [Mon, 13 Aug 2012 08:59:10 +0000 (10:59 +0200)]
Use Qt::WindowFlags, not Qt::WFlags.

The latter seems to date from the Qt 1 days, and such abbreviations
are not current Qt style.

Change-Id: I6384d32f125fe7800c57e387f48930a1e71fbe08
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
5 years agoSkip failing test for now.
Lars Knoll [Mon, 20 Aug 2012 08:10:28 +0000 (10:10 +0200)]
Skip failing test for now.

Created QTBUG-26889 describing the failure.
We need to skip the test for now to unblock qt5.git

Change-Id: I2be7ebcbd655a7a32a4c7e49d7a2e4889ee9c164
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
5 years agoRemove the user of the QWidgetStar metatypeid.
Stephen Kelly [Wed, 8 Aug 2012 08:18:19 +0000 (10:18 +0200)]
Remove the user of the QWidgetStar metatypeid.

It is to be removed, and is obsoleted by QMetaType::PointerToQObject.

Change-Id: I6832808cfd1e22d6c04c7ba37bf52ff7c36f0272
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
5 years agoUse qtxmlpatterns only if it is available
Yuchen Deng [Thu, 2 Aug 2012 12:47:33 +0000 (20:47 +0800)]
Use qtxmlpatterns only if it is available

Change-Id: I6a84f8b35f26fbe44b51ecf4f38aa2619996e83a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
5 years agomake use of QT_PRIVATE to specify private Qt dependencies
Oswald Buddenhagen [Tue, 7 Aug 2012 17:35:32 +0000 (19:35 +0200)]
make use of QT_PRIVATE to specify private Qt dependencies

Change-Id: Ia65d09d850a58e66db2d6d2a25703725283dbdb8
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
5 years agofollow rename of qt_module_config.prf to qt_module.prf
Oswald Buddenhagen [Tue, 7 Aug 2012 17:11:40 +0000 (19:11 +0200)]
follow rename of qt_module_config.prf to qt_module.prf

Change-Id: I1d1be313492c311aaaf6a87dd96d56d08feb097e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
5 years agoUpdate autotest to match new QScriptEngine::pushContext behavior
Kent Hansen [Tue, 14 Aug 2012 07:12:22 +0000 (09:12 +0200)]
Update autotest to match new QScriptEngine::pushContext behavior

See commit 68458376c0db2f786b2c9ab3b8dfd21695a5645e in qtscript.

Change-Id: If62bf96d9a965ba500c7a4786d347c828a1683b1
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
5 years agoRemove insignification from qdeclarativeimage test.
Jason McDonald [Fri, 3 Aug 2012 06:25:37 +0000 (16:25 +1000)]
Remove insignification from qdeclarativeimage test.

Prior to this change, the test had one stable XPASS on all CI platforms
except Ubuntu 10.04.  Limit the QEXPECT_FAIL to that one platform and
make the test significant again.

Task-number: QTBUG-26787
Change-Id: Id6c9dfc9a8d6de149dbb739c3e8c6311ce903c39
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoFix warning in qdeclarativeimage autotest.
Jason McDonald [Fri, 3 Aug 2012 06:31:35 +0000 (16:31 +1000)]
Fix warning in qdeclarativeimage autotest.

The test warned about an unregistered metatype, though this didn't cause
the test to fail.

Change-Id: I7338d3e2e4f81c7ab5351c4b7e7b69a60870d49f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoRemove insignification from qdeclarativeviewer autotest.
Jason McDonald [Fri, 3 Aug 2012 05:27:36 +0000 (15:27 +1000)]
Remove insignification from qdeclarativeviewer autotest.

This test was failing consistently until recently.  Make it significant
to prevent further regressions.

Change-Id: I90ad6215d034d219a938973a7430c58c3604e838
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
5 years agoRemove insignificant_test from qdeclarativexmlhttprequest.
Andrew den Exter [Mon, 6 Aug 2012 04:59:57 +0000 (14:59 +1000)]
Remove insignificant_test from qdeclarativexmlhttprequest.

A fix for the failures has been merged.

Task-number: QTBUG-26703
Change-Id: I23b2e8d8f4211b076a0c4666e77fd94a9b2a6580
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
5 years agoFix tst_qdeclarativexmlhttprequest failure on Windows.
Andrew den Exter [Mon, 6 Aug 2012 02:31:12 +0000 (12:31 +1000)]
Fix tst_qdeclarativexmlhttprequest failure on Windows.

Disable line ending conversion for test data files so that they are
served as lf on all platforms.

Task-number: QTBUG-26703
Change-Id: I1a48232f631a722342da6a8d50dcbe341ba5689c
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
5 years agoFix compilation of missed network depend
Yuchen Deng [Fri, 3 Aug 2012 03:42:22 +0000 (11:42 +0800)]
Fix compilation of missed network depend

fatal error: QNetworkReply: No such file or directory

Change-Id: If39be538bd135118d6654e154e86e8a082f03a58
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>