Commit Graph

4172 Commits

Author SHA1 Message Date
Timo Jyrinki 76d1e5e611 Add license files mandated by (L)GPL.
Currently only qtbase includes the required LICENSE files, which
are referred to from the code headers. The same files should
be distributed as part of all the modules as well, so that the
(L)GPL licenses are adhered.

These files were wget:d from:

https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL

As an addition to above, added also LICENSE.FDL. All the modules
additionally require it, since they include at least *.qdoc files and in
some cases a couple of others.

File received via
wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL

Change-Id: I35cb3523061cfb041084fe9a7e60928c44e224b2
Reviewed-by: Jason McDonald <macadder1@gmail.com>
2013-02-15 00:03:10 +01:00
Michael Brasser b324ee38a6 A MouseArea should not receive move or release events if the press was not accepted.
Change-Id: If70650d7150b224f4460697a953611dd37d57af1
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2013-02-14 15:04:05 +01:00
Stephen Kelly e6aaaca5c1 Remove QPointerBase bic check.
QPointerBase is not public or exported and it is to be removed

Change-Id: Ieb7360a1a01125d4bff20140b02ec71a076440cb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-02-13 15:07:00 +01:00
Marco Bubke 8627af718b DesignerSupport: Fix rendering in designer for if new items are added
The SG nodes are exchanged if the hierarchy the Qml hierarchy is changed.
So the SG root node should be always updated for every rendering.

Task-number: QTCREATORBUG-8699
Change-Id: I069142e4c5fc65efc3485017fa000ed7e8f2b350
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-02-12 14:45:38 +01:00
Gunnar Sletta afbdc916ba Remove use of QPainter::HighQualityAntialiasing. It has no effect.
Change-Id: I7e1d07a9f34d6edf9dbe3449d34636f700218532
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2013-02-12 09:19:49 +01:00
Gunnar Sletta 1e55fa7d4a Fix extending example.
The antialiasing was broken due to wrong flag being used and that the
bounds were outside the texture and chapter 5 and 6 did not compile.

Change-Id: Ib7c4d8c276a3cc5583ff794e10ff539720857e0c
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2013-02-12 09:19:45 +01:00
Nico Vertriest 5b8f77970d Doc: corrected reference to snippet in imageparticle.qdoc
Task-number: QTBUG-29101
Change-Id: If731480343fd4d65aa5fca5c184b03c14f2f340e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-02-08 11:57:10 +01:00
Venugopal Shivashankar 530b30ae17 Doc: Removed reference to QAbstractItemModel::setRoleNames()
This function is deprecated and it is recommended to
reimplement QAbstractItemModel::roleNames() instead.

Task-number: QTBUG-29456
Change-Id: Ib28759fe2349edd32a1b87bac04eb44d625d3e60
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-02-08 09:43:45 +01:00
Frederik Gladhorn 1d29d8edf8 Stabilize resizemodeitem test.
Resizing can take time. Instead of qWait(50)
use QTRY_COMPARE to make sure we give enough time.

Change-Id: I484eca1f4d49381913dc82f405c73de653608493
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-02-07 14:58:26 +01:00
Samuel Rødal fc454c16c8 Fixed Canvas ImageData pixel values not being settable to 0.
Someone probably figured "since the data is all initialized to 0 to
begin with, we can skip 0 values". However, it's possible to temporarily
set a value to other than 0 and then back to 0, a fully valid use case
that we need to support.

Task-number: QTBUG-29065
Change-Id: Ia9f0803743d696ca8b9cca89c666ccba80a3abd0
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-02-07 08:41:08 +01:00
Oswald Buddenhagen 34c679bc32 substitute fixed version numbers in qdocconf files with variables
Change-Id: If28446d2d14dde62ff662ffdd366dc6384c95326
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-02-06 09:44:50 +01:00
Friedemann Kleint c0ec84946d Fix lupdate-warning in qqmlrewrite.cpp.
Class 'QQmlRewrite' lacks Q_OBJECT macro.

Replace global-static strings by message functions.

Change-Id: I67a6fbe67575533d3ce5750d72c9d7eff06e7efa
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
2013-02-06 09:31:25 +01:00
Friedemann Kleint 06fad3e877 Fix lupdate-warnings in qqmlimport.cpp.
qqmlimport.cpp:738: Class 'QQmlImportsPrivate' lacks Q_OBJECT

Remove tr()-function and use QQmlImportDatabase::tr()
directly.

Change-Id: I3a1561c57a6ee90d271a6043b0175e17a7828666
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
2013-02-06 09:31:20 +01:00
Friedemann Kleint c0c0340e4d Fix lupdate-warnings.
qqmlcomponent.cpp:667: Cannot invoke tr() like this
qqmltypeloader.cpp:2292: Cannot invoke tr() like this
qquickloader.cpp:944: Cannot invoke tr() like this

Change-Id: Ifdd1a7b958b6af88f251e7df27eb4d4018301914
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
2013-02-06 09:31:15 +01:00
Alan Alpert 0288131796 Add next.png to shared qrc files
Otherwise the executable versions of the examples print errors instead
of loading it.

Change-Id: I7d370ce3ee172491c004668847cdb6d5967f2b24
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-06 02:56:12 +01:00
Andrew den Exter 561ab99ad6 Ensure the cursorRectangle is updated as the width of the text changes.
Outside of when of a monospace font is used, if the text changes the
visual position of the cursor will have most likely changed as well
even when the cursor index hasn't.

Task-number: QTBUG-28677
Change-Id: If8077772d8541a677d5875976e6cd9fc453731df
Reviewed-by: Alan Alpert <aalpert@rim.com>
2013-02-01 00:52:44 +01:00
Sergio Ahumada 4965130780 Merge branch 'release' into stable
Change-Id: Ic270f7814489b2c7df7e0f1ecb46cd516802cac5
2013-01-31 15:23:09 +01:00
Gunnar Sletta 15b232bf69 Document QQuickItem::itemChange and QQuickItem::window() properly
Change-Id: Ic0e50ae8760c0c3050db3a095b0fa86679a0c010
Reviewed-by: Alan Alpert <aalpert@rim.com>
2013-01-31 07:06:25 +01:00
Alan Alpert d005c5c80b Strengthen reference to var properties during construction
Normally var properties are kept alive by a reference to the object they
are declared on, but during the construction of that object the GC may
not be aware of said object. This change uses a strong reference during
GC passes which take place while the object is being constructed.

Task-number: QTBUG-29138
Change-Id: Ieecfcc7567aefac0d67cb933728daf16ed3eed0a
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
2013-01-29 19:18:04 +01:00
Gunnar Sletta 6327d29471 docfix: Emitter.enabled was documented as Emitter.emitting.
Change-Id: I9500c336b9e11f858da95ff4ed783b70876f3fd6
Reviewed-by: Alan Alpert <aalpert@rim.com>
2013-01-29 06:25:46 +01:00
Alan Alpert ca711d7e68 Fix memory leak
The cache is filled with dynamically created entries, so clear is not
quite enough.

Change-Id: I40a49ce5d1a3d6da1b419e85cae95f2f95011a19
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
2013-01-29 02:30:06 +01:00
Nico Vertriest f4d4689d3c Doc: declarative-colors.png not visible in qmltypereference.qdoc
Copied the file from qml image dir to quick image dir

Task-number: QTBUG-29101
Change-Id: Iae64763bc38e135a0dbff8566cf540a309e4c42f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-28 18:50:39 +01:00
Nico Vertriest a717da652a Doc: corrected path to snippet
Added "quick" to path in imageparticle.qdoc

Task-number: QTBUG-29101
Change-Id: If328cde08f46b720defa1953916753ba9d9836a8
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-28 15:25:15 +01:00
Sze Howe Koh 394d83e86f Fix unterminated comment
Change-Id: Ic5bcbac339588fdded265a00515f768058d73870
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-28 12:21:25 +01:00
Sze Howe Koh a74a2e913b Doc: Fix "Command '\li' outside of '\list' and '\table'"
It doesn't look like any list is meant to be here. All other instances
of "down" are italicized in this document, so we follow suit.

Change-Id: I2f0c55dba2025b4eef81248a5f650ebaaaa5bb3a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-28 12:20:53 +01:00
Oswald Buddenhagen 8fcecca8d2 fix qmltest example install path
Change-Id: I267155bb34b8226331fc2951521dc7b8643a014c
Reviewed-by: Alan Alpert <aalpert@rim.com>
2013-01-28 07:10:10 +01:00
Oswald Buddenhagen 99cf339f96 mark forgotten EXAMPLE_FILES
Change-Id: I83c7706479ea3afd45ab9c97f63f68d416b28f55
Reviewed-by: Alan Alpert <aalpert@rim.com>
2013-01-28 07:10:06 +01:00
Oswald Buddenhagen 6c18353123 fix installation of qmltestcase example
split the project along the built-as-part-of-qt line:
in qt, it must comply with the installation rules for examples, and it
shouldn't be an actual test case - our CI is not supposed to run it ...
the stand-alone build (which users are supposed to make use of) needed
adding TESTDATA for proper installation.

Change-Id: I1bbf7b1204410c5eb8755477310bb023e8f87623
Reviewed-by: Alan Alpert <aalpert@rim.com>
2013-01-28 07:10:03 +01:00
Fabian Bumberger 7cbfd6b3d2 Introduce a workaround for a GLSL bug on BB10
When using the sizeTable property of the QQuickImageParticles, the vertex shader is not compiling.
This is a workaround for a compiler bug on BB10.

Change-Id: I32d5e92bc300304cb856d97b1310f607df1e48be
Reviewed-by: Alan Alpert <aalpert@rim.com>
2013-01-26 22:07:39 +01:00
Michael Brasser d2491c6e24 Prevent possible leak with texture providers.
If the job has been cancelled, ensure we clean up the texture factory
that was created.

Change-Id: I0a6e4a23732e6041084ddc483d701a25befd91c9
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-01-25 22:31:04 +01:00
Topi Reinio 6bffd4b52d Doc: Add QML Types to table of contents in Assistant
Replace 'headerfile' with 'qmlclass' in qdocconf file.

As a positive side-effect, QDoc will also add files for 'All members'
for QML Types into .qhp as well.

Task-number: QTBUG-29226
Change-Id: I282ef42283ec147ea0f2b466b15e7f104c8a012a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
2013-01-25 09:50:45 +01:00
Frederik Gladhorn 6933b7e8e6 Ungrab mouse when FocusAboutToChange instead of Leave
Commit 7b2e211716
introduced a regression in mouse handling:
When moving the mouse out of the window it would cancel
all further mouse events. That is actually not wanted
(eg scroll bars).
Instead ungrab the mouse when the focus changes,
that means the mouse handling with popups works and the
scrollbar use case is also fixed.

All the tests related to this seem quite timing sensitive,
so try some more QTRY_VERIFY.
Remove the parallel_test so that more cpu time will actually
let the tests pass more reliably.

Change-Id: I90586b05f461d3762728a466d71bcb967e03d14b
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2013-01-24 18:17:04 +01:00
Debao Zhang d442531880 Doc: Fix uses of \since
Change-Id: Idf497424279fbee08e6e5750e6a15372c808105f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-24 16:41:26 +01:00
Eskil Abrahamsen Blomfeldt dde265294f Fix alignment of Text element with implicit size
In change e1d6b323d4 there's an
optimization which disables layouts on the QTextDocument, but the
layout has to be re-enabled before we can call idealWidth() since
this will be zero as long as the page size is 0x0. We simply set
the page size to undefined again before calling idealWidth.

Task-number: QTBUG-29262
Change-Id: I6bebe7be4c99fce0de8fc4178b5e1abc81abbe87
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: aavit <eirik.aavitsland@digia.com>
2013-01-24 14:14:49 +01:00
Michael Brasser c5fb0a9d8a Disconnect from previous loading image when loading a new image.
Change-Id: If2fa95d9715a55d3f07ecf5f232e4f4b9a44a6fb
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-01-24 12:32:41 +01:00
Jerome Pasion 38d42bf35f Doc: Updated change log with documentation entry
Change-Id: I1cd4dc70265f2425045328910be12a0cfaeb795c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-01-24 10:46:02 +01:00
Eskil Abrahamsen Blomfeldt 57f593b96f Make HTML horizontal alignment work like in QtQuick 1
If the text width set is higher than the ideal width, there's
no risk of wrapping, and thus we align the text based on the
full width of the Text element. This matches the behavior in
Qt Quick 1.1.

Task-number: QTBUG-29262
Change-Id: Ib191e3dd9d17e3bea63ca7825708f53768960e26
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-01-24 09:33:42 +01:00
Christian Stenger 1cdbd29988 Remove outdated macro usage
Change-Id: I4b58f3d74d7dec9a95a07b907c500990630e7762
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-24 09:00:30 +01:00
Frederik Gladhorn 742cff521a Stabilize QQuickTextEdit test
tst_qquicktextedit::remoteCursorDelegate was failing
because the test server served the the remote file too
fast. It seems like the test relied on a slow machine to
run it.
Instead pass the Delay option to make the server serve
the file delayed.

Change-Id: Id99feea07f2da3b2ea0aa6c07e9b548e8f81f18b
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2013-01-23 12:11:43 +01:00
Jerome Pasion 8a4829ef15 Doc: Fixed "QML Types" node in Assistant
Removed "class" from the "selectors" variable in qdocconf file.

Task-number: QTBUG-29242
Change-Id: I960dcbdb22358e033177b0ccb9c211136c0e4dcb
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
2013-01-22 22:21:12 +01:00
Xingtao Zhang 7c5b2e93a0 QQuickImageProvider: fixed three \snippet paths
Change-Id: I289e61c7e3acc3d7047b2b26fae624900e076586
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-21 18:30:39 +01:00
Topi Reinio 0111e8b353 Clean up accessibility QtQuick example
Remove an undefined value (column.h) used in the accessibility
example and fix minor indentation and style issues.

Task-number: QTBUG-29225
Change-Id: I118ca7ee4fd24a3e94eb9b39e60514314ddcd7f0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-21 16:19:33 +01:00
Tasuku Suzuki 9e604dcd07 Fix crash in PathView
Change-Id: I259e7af1755ff9615782bbce03fc41ea1957cab3
Task-number: QTBUG-29176
Reviewed-by: Alan Alpert <aalpert@rim.com>
2013-01-18 18:19:16 +01:00
Gunnar Sletta 0d17d4a19c Merge "Merge branch 'release' into stable" into refs/staging/stable 2013-01-17 22:48:20 +01:00
Gunnar Sletta 36a42ed6b1 Merge branch 'release' into stable
Change-Id: I88ecd5f396ecd9a9c910108d1cca832a3087f1d8
2013-01-17 22:06:30 +01:00
Topi Reinio 21c1cfb867 PathCurve documentation: fix non-working example snippet
Set the contextType property in the example code that demonstrates
using PathCurve with Canvas; without it the code doesn't work.

Task-number: QTBUG-29114
Change-Id: I75be931d5a30a26efceb2c2493f5e41d092dbbc5
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
2013-01-17 20:22:17 +01:00
Eskil Abrahamsen Blomfeldt 9e11754fdc Enable sub-pixel anti-aliasing for default builds on Windows
While ANGLE builds only provide the OpenGL ES2 APIs, it's still
a desktop technology and we should default to using high quality
anti-aliasing.

Task-number: QTBUG-28782
Change-Id: Iefc764589e935899ead278cedef4c302694dd2bb
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-01-17 15:41:38 +01:00
Gunnar Sletta fc0e916784 Avoid race condition in QQuickTests
The QQuickView::show() function may or may not be synchronous and
because the rendering happens on another thread, the frameSwapped
can be emitted before we enter the qWaitForSignal() event loop.
Fix this by waiting for the window to become exposed instead, which
implies that it has rendered at least one frame.

Change-Id: I1100a6fe981018395bf141d67f06adb94a354206
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2013-01-17 15:31:04 +01:00
Jens Bache-Wiig 9597ef6541 Improve the look and feel of our demo launcher
The existing demo launcher looks rather ugly. This does some
visual tweaks to make it look better, including adding support
for proper text wrapping.

It was approved by our design lead Diana.

Change-Id: I660764575a411f598c53c9c42e290a807e20c0cf
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2013-01-17 13:56:21 +01:00
Thomas Hartmann 559851ef0c Exporting required symbols for Qt Quick Designer
These classes are used by qml2puppet.

Qml2Puppet is an external process used by the Qt Quick Designer,
that builds the interface between the designer and Qt Quick/QML
internals.

Qml2Puppet is responsible for emulation and rendering.
The 2 in Qml2Puppet indicates that it is used for Qt Quick 2.0.

This would be nice to have in Qt 5.0.1 to allow testing based
on official packages. Also this helps early adaptors.

QQmlTimer is used to disable timers.

QQuickTextEdit and QQuickTextInput are used to disable the blinking
cursor.

QQuickBehavior is used to deal with behaviors.

QQuickPropertyChanges and QQuickStateGroup are
used to emulate states.

QQuickTransition is used to disable transitions.

Task-number: QTCREATORBUG-8572

Change-Id: I572707d93eda477df945976442efed32ef16df34
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-17 12:27:54 +01:00