Frederik Gladhorn [Mon, 7 Jan 2013 15:19:53 +0000 (16:19 +0100)]
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Erik Verbruggen [Tue, 18 Dec 2012 13:54:16 +0000 (14:54 +0100)]
Fix: disallow incomplete hex numbers "0x" and "0X".
See also ECMA 5.1, 7.8.3, rule HexIntegerLiteral.
Change-Id: I356dc7cfbc88890bb7f35c8bc4219a37633177f8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Frederik Gladhorn [Fri, 4 Jan 2013 11:48:06 +0000 (12:48 +0100)]
Merge branch 'stable' into dev
Conflicts:
src/qml/qml/parser/qqmljskeywords_p.h
sync.profile
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
Change-Id: I9bc6659e1bab924009167bec567354d40a77a8cb
Lars Knoll [Thu, 3 Jan 2013 16:13:38 +0000 (17:13 +0100)]
Add the getter/setter type to PropertyGetterSetter
Required to differentiatate between getters and
setters.
Change-Id: I48b2fb911192a8cc5840ff11e31b885f62ac6179
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Paul Olav Tvete [Wed, 12 Dec 2012 09:25:31 +0000 (10:25 +0100)]
Revert "Mark autotest as insignificant on mac"
The underlying bug was fixed by change I3b361655e25b6cf2d5e29410dc1f3567ab8f54d9
This reverts commit
d355a609d4a314657a585be4750d2ed375c621a5.
Change-Id: If01675097544a0271130dcbb7959ccf2425620c2
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Liang Qi [Thu, 27 Dec 2012 08:48:07 +0000 (09:48 +0100)]
qmltest: Added the possibility to use QApplication
Current QML test cases in QtDesktopComponents still need to use
QApplication.
Added QT_QMLTEST_WITH_WIDGETS define when QtWidgets is available.
Also proveded a command line switch "-widgets" for it.
Change-Id: Ib6c7313538cb8875144636b6f8bd264b0f13aa8d
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Sergio Ahumada [Sat, 22 Dec 2012 15:28:15 +0000 (16:28 +0100)]
Add changes-5.0.1 file
Task-number: QTBUG-26065
Change-Id: I3345a178cdfbc8e8c68b0e069eb9928772353186
Reviewed-by: Alan Alpert <aalpert@rim.com>
Sergio Ahumada [Fri, 21 Dec 2012 23:27:51 +0000 (00:27 +0100)]
Bump Qt version to 5.0.1
Change-Id: I8cadaec38aff1348c80c552e7fe072b6a7aa31b1
Reviewed-by: Alan Alpert <aalpert@rim.com>
Thiago Macieira [Sat, 22 Dec 2012 06:54:02 +0000 (22:54 -0800)]
Fix other warnings in qtdeclarative found by GCC 4.7
qml/qml/qqmlimport.cpp:982:30: error: unused parameter 'errors' [-Werror=unused-parameter]
quick/util/qquickanimationcontroller.cpp:66:6: error: unused parameter 'job' [-Werror=unused-parameter]'
quick/items/qquickshadereffectnode.cpp:160:17: error: case value '38' not in enumerated type 'QVariant::Type' [-Werror=switch]
quick/items/qquickwindowmanager.cpp:286:60: error: 'renderTime' may be used uninitialized in this function [-Werror=maybe-uninitialized]
quick/items/qquickitem.cpp:5267:67: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]
and a few more repeated from the above
Change-Id: Id1950c6ba98f7f8475975716b21bd795ecb4bd20
Reviewed-by: Alan Alpert <aalpert@rim.com>
Thiago Macieira [Sat, 22 Dec 2012 07:02:45 +0000 (23:02 -0800)]
Fix warnings in QtQml due to ?: with enums of different types
The compiler was complaining a lot about:
qml/parser/qqmljskeywords_p.h:400:57: error: enumeral mismatch in conditional expression: 'QQmlJS::Lexer::<anonymous enum>' vs 'QQmlJSGrammar::VariousConstants' [-Werror=enum-compare]
Change-Id: Ib6acd3fbae048c33626321bf5e7ee8b50bb6b48e
Reviewed-by: Alan Alpert <aalpert@rim.com>
Miikka Heikkinen [Thu, 20 Dec 2012 09:36:47 +0000 (11:36 +0200)]
Add qmake generated files to .gitignore.
Add source files generated by qmake for automatic static plugin
imports to .gitignore.
Change-Id: I4c5488bdc146f501963f5414017ba80d781210ef
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Friedemann Kleint [Tue, 18 Dec 2012 10:41:06 +0000 (11:41 +0100)]
Quick tests: Introduce QQmlMessageHandler.
Add QQmlMessageHandler class that can be used to record messages
into a QStringList. It also makes sure that the old message
handler is reinstalled if the test fails.
Task-number: QTBUG-28611
Change-Id: I0fff7bc11e188cf47178d9573e5f2eead693bc10
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Friedemann Kleint [Wed, 19 Dec 2012 15:18:52 +0000 (16:18 +0100)]
Fix compiler warnings in declarative tests.
- Unused variables
- Missing enumeration values in switch
- truncation from double to float
- truncation from size_t to int
- Missing initializers
- Mix of operator & and bool |
Change-Id: Ib212aeea41befef193f12300a1d9814a60f183af
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Albert Astals Cid [Wed, 19 Dec 2012 10:25:16 +0000 (11:25 +0100)]
Do not crash on some animation changes
stop() might end up deleting the animationjob object so wrap
the call with a RETURN_IF_DELETED
Fixes valgrind complaining
==18380== Invalid read of size 1
==18380== at 0x5530B24: QAbstractAnimationJob::setCurrentTime(int) (in /home/tsdgeos/qt5/qtdeclarative/lib/libQt5Qml.so.5.0.0)
==18380== by 0x5530BDE: QQmlAnimationTimer::updateAnimationsTime(long long) (in /home/tsdgeos/qt5/qtdeclarative/lib/libQt5Qml.so.5.0.0)
==18380== by 0x65C05DC: QUnifiedTimer::updateAnimationTimers(long long) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Core.so.5.0.0)
==18380== by 0x65C10E3: QAnimationDriver::advanceAnimation(long long) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Core.so.5.0.0)
==18380== by 0x5047DB9: QQuickRenderThreadSingleContextWindowManager::event(QEvent*) (qquickthreadedwindowmanager.cpp:588)
==18380== by 0x58D7F9B: QApplicationPrivate::notify_helper(QObject*, QEvent*) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Widgets.so.5.0.0)
==18380== by 0x58DB364: QApplication::notify(QObject*, QEvent*) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Widgets.so.5.0.0)
==18380== by 0x6756B9D: QCoreApplication::notifyInternal(QObject*, QEvent*) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Core.so.5.0.0)
==18380== by 0x6758855: QCoreApplicationPrivate::sendPostedEvents(QObject*, int, QThreadData*) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Core.so.5.0.0)
==18380== by 0x679E7C2: postEventSourceDispatch(_GSource*, int (*)(void*), void*) (in /home/tsdgeos/qt5/qtbase/lib/libQt5Core.so.5.0.0)
==18380== by 0x85B7AB4: g_main_context_dispatch (gmain.c:2715)
==18380== by 0x85B7DE7: g_main_context_iterate.isra.24 (gmain.c:3290)
==18380== Address 0x1642bd48 is 88 bytes inside a block of size 128 free'd
==18380== at 0x4C2A44B: operator delete(void*) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==18380== by 0x4F0728B: QQuickBehavior::write(QVariant const&) (qquickbehavior.cpp:210)
==18380== by 0x53EB0FE: QQmlVMEMetaObject::metaCall(QMetaObject::Call, int, void**) (in /home/tsdgeos/qt5/qtdeclarative/lib/libQt5Qml.so.5.0.0)
==18380== by 0x54FEA08: StoreProperty(QV8Engine*, QObject*, QQmlPropertyData*, v8::Handle<v8::Value>) (in /home/tsdgeos/qt5/qtdeclarative/lib/libQt5Qml.so.5.0.0)
==18380== by 0x79ED2CE: v8::internal::JSObject::SetPropertyWithCallback(v8::internal::Object*, v8::internal::String*, v8::internal::Object*, v8::internal::JSObject*, v8::internal::StrictModeFlag) (in /home/tsdgeos/qt5/qtjsbackend/lib/libQt5V8.so.5.0.0)
==18380== by 0x7A0AE71: v8::internal::JSObject::SetPropertyForResult(v8::internal::LookupResult*, v8::internal::String*, v8::internal::Object*, PropertyAttributes, v8::internal::StrictModeFlag) (in /home/tsdgeos/qt5/qtjsbackend/lib/libQt5V8.so.5.0.0)
==18380== by 0x7A0B2D8: v8::internal::JSReceiver::SetProperty(v8::internal::String*, v8::internal::Object*, PropertyAttributes, v8::internal::StrictModeFlag, bool) (in /home/tsdgeos/qt5/qtjsbackend/lib/libQt5V8.so.5.0.0)
==18380== by 0x79A8861: v8::internal::StoreIC::Store(v8::internal::InlineCacheState, v8::internal::StrictModeFlag, v8::internal::Handle<v8::internal::Object>, v8::internal::Handle<v8::internal::String>, v8::internal::Handle<v8::internal::Object>) (in /home/tsdgeos/qt5/qtjsbackend/lib/libQt5V8.so.5.0.0)
==18380== by 0x79A8DF0: v8::internal::StoreIC_Miss(v8::internal::Arguments, v8::internal::Isolate*) (in /home/tsdgeos/qt5/qtjsbackend/lib/libQt5V8.so.5.0.0)
==18380== by 0x24E8BD20618D: ???
==18380== by 0x24E8BD237AC9: ???
==18380== by 0x24E8BD2249E6: ???
Change-Id: Idcb195206d344bb526ee37f9172a6b3c029540db
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Volker Krause [Fri, 30 Nov 2012 15:05:55 +0000 (16:05 +0100)]
Compile with QT_NO_WHEELEVENT.
Change-Id: I2fbe6f45ba50e3db75bd02cfca47ddabfcd5fc49
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Frederik Gladhorn [Sun, 4 Nov 2012 11:54:30 +0000 (12:54 +0100)]
Accessibility: Improve interface handling in Quick
This changes how interfaces are handled:
the QAccessibleQuickItem will simply subclass
all interfaces and dynamically return 0 or the
appropriate interface_cast.
This makes our implementation a lot more flexible.
To make use of the value interface, only a value
property is needed (together with a corresponding role).
Since the implementation of the interfaces became simpler,
the value interface and some text interface improvements
go along with the change.
Change-Id: I003ec3016d48d730a4acac467bce322167842f4d
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Friedemann Kleint [Mon, 17 Dec 2012 13:00:10 +0000 (14:00 +0100)]
Stabilize QQuickLoader test on Windows.
Wait until the component is ready in network tests.
Task-number: QTBUG-28611
Change-Id: I3f880ee585199a3c8ba2d672bb365fa60c472499
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Friedemann Kleint [Tue, 18 Dec 2012 11:14:34 +0000 (12:14 +0100)]
Fix tst_qqmlbundle on Windows.
The plugin was not found since it was in the Release/Debug
subfolder, respectively.
Task-number: QTBUG-28611
Change-Id: Ieaea7c67e2524a7d0ca3011d96f31b15929e551c
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Friedemann Kleint [Tue, 18 Dec 2012 11:59:19 +0000 (12:59 +0100)]
Fix tst_qqmllanguage for MSVC.
Do not use \u.
Task-number: QTBUG-28611
Change-Id: I85fce2f945c97421b8b35fb8276cd4ee3cc19d38
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Jerome Pasion [Mon, 17 Dec 2012 14:48:56 +0000 (15:48 +0100)]
Doc: Enabling Qt QML linking to Qt Quick.
Allows Qt QML pages to link to Qt Quick.
Task-number: QTBUG-28579
Change-Id: I9eafadc5ee14a5588a5863960c4463132b73b287
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Erik Verbruggen [Wed, 12 Dec 2012 11:24:15 +0000 (12:24 +0100)]
Added parsing for getter/setter definitions in property assignments.
Specified in ecma 5.1, 11.1.5.
Change-Id: I93d12593534ed8a987922c8aa329124940e77c6f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Oswald Buddenhagen [Fri, 14 Dec 2012 19:02:06 +0000 (20:02 +0100)]
remove obsolete DEPENDPATH assignments
qmake now add CONFIG+=depend_includepath by default, making manual
DEPENDPATH setup unnecessary.
Change-Id: I6cefdd70ffd3a0ef889752eafec8b999822588cf
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Fri, 14 Dec 2012 18:22:13 +0000 (19:22 +0100)]
remove some unnecessary CONFIG additions
qt is already added by spec_pre.prf, warn_on by default_pre.prf and dll
by qt_module.prf.
Change-Id: I449e49275622bac39b7d76af8855c417ddce21e9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Alan Alpert [Thu, 1 Mar 2012 10:09:52 +0000 (20:09 +1000)]
Add a hidden XandYAxis enum value
For Qt 5 XandYAxis is being renamed to XAndYAxis to more consistently
follow capitalization rules. Add an undocumented XandYAxis variable to
ease porting.
Change-Id: Id9e41dd5578373f5f557937da889a9326ff12e53
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Miikka Heikkinen [Wed, 12 Dec 2012 11:28:28 +0000 (13:28 +0200)]
Add minimal plugin importing to quick2 qmlplugindump tool
Task-number: QTBUG-28131
Change-Id: Iad55e3c6057b060cd8f8233e02a6151c91cc32ed
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Oliver Wolff [Thu, 13 Dec 2012 15:19:46 +0000 (16:19 +0100)]
Fixed samegame tutorial part 4 to reflect Quick2 state
Change-Id: I61a3d63bc0268256ff6497339a6d97719a59860f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Jens Bache-Wiig [Thu, 13 Dec 2012 20:18:19 +0000 (21:18 +0100)]
Improved cosmetics for StockQt
This will not get us any design awards but it looks
a bit more professional than the original.
Change-Id: Ib01a20ebad5888af44c174cbd493ce8d99dcf7b6
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Jens Bache-Wiig [Thu, 13 Dec 2012 18:16:13 +0000 (19:16 +0100)]
Clean up the StockQt demo
I cleaned up the whitespace, property declarations and removed
some console output. No changes to the functionality or design.
Change-Id: I499f6d061e43bf2e187eebc026858b3abd21a9b0
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>
Sergio Ahumada [Wed, 12 Dec 2012 20:55:33 +0000 (21:55 +0100)]
sync.profile: Point dependencies to 'refs/heads/dev'
We should test dev branches against dev branches only by default.
At some point we should automate the merges from release->stable->dev
andi/or decide how to handle possible conflicts.
This is good enough for the time being.
Change-Id: Ifeae1b5de37e7bcaefbfa9038e50f3667645eca2
Reviewed-by: Alan Alpert <aalpert@rim.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Alan Alpert [Fri, 30 Nov 2012 20:23:53 +0000 (12:23 -0800)]
Fix StocQt buttons
They're now on screen and using better componentization for the styling.
Task-number: QTBUG-28291
Change-Id: If21712e523c706ee05d257e209ed71dd61acf2dc
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Alan Alpert [Sat, 8 Dec 2012 20:20:35 +0000 (12:20 -0800)]
Update porting docs
Some improvements to the QML engine in Qt 5 lead to behavior changes.
These should be explained in the porting guide.
Task-number: QTBUG-28411
Change-Id: Ifc4016cf7b33ba113dbe0cbabd2f71a4ff1a8685
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Bea Lam <bea.lam@jollamobile.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
hjk [Wed, 12 Dec 2012 09:56:44 +0000 (10:56 +0100)]
Change virtual folders in .qdocconf to qtqml and qtquick
This seems more in line with the rest of the qdocconf files
Change-Id: I91999205b0632a2c0e57f428754cf5928a1ea6c7
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
hjk [Wed, 12 Dec 2012 09:45:07 +0000 (10:45 +0100)]
Add \brief comment to Custom Geometry example
Change-Id: I11be2329d2d396bc778a5eeda45dda9b30337285
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Kai Koehne [Tue, 11 Dec 2012 13:17:34 +0000 (14:17 +0100)]
Use resource files for most examples
Make examples shadow-build-friendly by using resource
files instead of trying to derive the qml path from
applicationDirPath().
Change-Id: I669424554c772d9b261249b366247190f5fbd8b1
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Michael Brasser [Sat, 8 Dec 2012 05:05:48 +0000 (23:05 -0600)]
Work towards supporting front-to-back reordering of opaque items.
Change-Id: Ic3b9defa6ac61409adcfb2b5cb8167698ed00255
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Oliver Wolff [Thu, 6 Dec 2012 13:54:32 +0000 (14:54 +0100)]
Fixed abstractitemmodel example
Change-Id: I1e85fd3f35f4f3d80e3fb599ae95b771db5f949b
Reviewed-by: hjk <qthjk@ovi.com>
Oliver Wolff [Tue, 11 Dec 2012 07:20:33 +0000 (08:20 +0100)]
Fixed install targets for model examples
Change-Id: I4c23fe37ec7adc17180c2405e68273b5cd3ee219
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Kai Koehne [Tue, 11 Dec 2012 12:59:44 +0000 (13:59 +0100)]
Examples: Remove unused import "../shared"
Change-Id: I3c84eab1ff97380362828aa96b0d5189cbd62509
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Oliver Wolff [Tue, 11 Dec 2012 07:15:50 +0000 (08:15 +0100)]
Removed leftover file from example cleanup
Change-Id: I63b9ca28724d651d8e4cb74eed114665a75e8b18
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Gunnar Sletta [Tue, 11 Dec 2012 15:59:02 +0000 (16:59 +0100)]
Improved the scene graph overview a bit
Change-Id: I82f5a48801b2c8ed94ef1f8d0b2e82998bb91c78
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Stephen Kelly [Tue, 11 Dec 2012 14:22:50 +0000 (15:22 +0100)]
Move the Q_DECLARE_METATYPE to where it should be.
Change-Id: Id17b30ed59fd9e68229bb80de5b9e4bc2aa0b75d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Oswald Buddenhagen [Mon, 3 Dec 2012 20:34:23 +0000 (21:34 +0100)]
make use of qt_headersclean.prf
Change-Id: I50f2299573770bb546333f57a61b6eb6b7e80e4e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Lars Knoll [Tue, 11 Dec 2012 21:24:29 +0000 (22:24 +0100)]
Fix invalid compression in qmlmin
qmlmin could compress identifiers in an invalid way if
it contained special chars that would get expanded to
unicode escape sequences
Change-Id: I35b3ba01f68b69b34c4cd19616afb8b4b4cd6fa3
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Lars Knoll [Tue, 11 Dec 2012 20:09:47 +0000 (21:09 +0100)]
Don't assume QChar::null() is the end of input
The lexer currently assumes a null QChar implies the end
of our input stream. Change it to take the full string into
account. null QChar's inside comments or strings are now
accepted, everywhere else they will cause a parse error.
Change-Id: I60c40a32d5afe94c6c56d8a8092fc32726b98420
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Lars Knoll [Tue, 11 Dec 2012 07:02:09 +0000 (08:02 +0100)]
super is always a reserved keyword
According to 7.6.1.2 of the EcmaScript 5.1 spec, super
is always a reserved keyword.
Change-Id: Idc300326c036eb9f0a12aa8eec8427023b7652b2
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Lars Knoll [Tue, 11 Dec 2012 06:51:22 +0000 (07:51 +0100)]
Bail out on stray newlines in strings in JS mode
Still allow newlines in QML mode to keep compatibility
for existing code.
Change-Id: I11dbd5a73ea8958f5ddc199b77a919969f8a5214
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Lars Knoll [Tue, 11 Dec 2012 06:50:10 +0000 (07:50 +0100)]
Don't bail out on 0 chars in comments
Gets a few more parser tests in the test suite to pass.
Change-Id: Id9ac5211f64aafdd621f6187ad7061ff967bc947
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Lars Knoll [Tue, 11 Dec 2012 05:59:37 +0000 (06:59 +0100)]
Fix the test suite
We now fail when parsing octal numbers or escape sequences. This
is ok according to the EcmaScript 5.1 spec. So remove all usages
of these numbers or sequences.
In addition delete an invalid test case that can't possibly be
parsed correctly. V8 also chokes on it.
Change-Id: I889de2810310f38206343d16175f9e31ddb44d30
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Lars Knoll [Mon, 10 Dec 2012 23:25:55 +0000 (00:25 +0100)]
Parse identifiers according to spec
If a unicode escape sequence decodes to a char that is
not allowed in the identifier we need to throw a parse
error. So decode before checking whether the char is
valid.
Also fix the set of accepted unicode characters for the
start and in the middle of an identifier to what the spec
demands.
Change-Id: I35075b0587ef4e4edb745750cec6d5c764631c0d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Lars Knoll [Mon, 10 Dec 2012 21:06:33 +0000 (22:06 +0100)]
Throw a parse error on octal numbers and escape sequences
This is compliant with EcmaScript 5.1, where octal numbers
and escape sequences are an optional and deprecated part
of the syntax.
Allow leading 0's in qml mode, but interpret the result
as decimal. This is also to keep compatibility with
existing code.
Change-Id: Ic3450ec3dd17966846751ee688a90c65939ba78f
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Gunnar Sletta [Mon, 10 Dec 2012 10:46:56 +0000 (11:46 +0100)]
Add command-line option to enable multisampling
Change-Id: I9ec8961342c23ea2c116c970e84aa412365412a9
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Miikka Heikkinen [Mon, 10 Dec 2012 12:18:22 +0000 (14:18 +0200)]
Add PLUGIN_CLASS_NAME to qtdeclarative plugins
Needed for automating static plugin loading.
Task-number: QTBUG-28131
Change-Id: I558a0f83c69179d3838c64fee069cc0e9c1d67cb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Alan Alpert [Fri, 10 Aug 2012 06:51:01 +0000 (16:51 +1000)]
Move examples around
imageprovider is a QtQuick example. Models and Views examples are now split up,
as one is a collection of C++ examples and the other is banded into a single
QML example.
Task-Number: QTBUG-24133
Change-Id: I81874871bd69ffef6a88df84f3d3f649e0c56bc6
Reviewed-by: hjk <qthjk@ovi.com>
Oswald Buddenhagen [Thu, 29 Nov 2012 15:02:34 +0000 (16:02 +0100)]
centralize and fixup example sources install targets
follow respective change in qtbase
Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Philip Lorenz [Sat, 1 Dec 2012 11:58:39 +0000 (12:58 +0100)]
Only free context if the owning QV8ContextResource gets destroyed
Since
fdeee38b781376012c4f086276c3c376726c8839 QQmlXMLHttpRequest stores
the calling context for later use. This leads to issues after the first
request completes and the wrapping QV8ContextResource gets freed by
garbage collection and therefore removes the associated QQmlDataContext
which may still be required for later calls (e.g. if the calling context
is part of a stateless library).
This patch introduces an ownership flag for QV8ContextResource which
indicates if the associated context should be cleared when the object is
destroyed.
Task-number: QTBUG-28351
Change-Id: I552ebb5c55b889eb33f3884283c8fdf037ac33be
Reviewed-by: Alan Alpert <aalpert@rim.com>
Paul Olav Tvete [Fri, 7 Dec 2012 12:06:50 +0000 (13:06 +0100)]
Don't generate duplicate doc pages
Cross-linking works now, so we don't need the old hack anymore.
Change-Id: I7d413788f643a75f3407f7186f5e1bdc9ed972a6
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Paul Olav Tvete [Fri, 7 Dec 2012 12:47:22 +0000 (13:47 +0100)]
Fix doc links to submodels
Change-Id: I2c65a77ca9c5fa1df1f0ff2ea67655e9ce1b0039
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Paul Olav Tvete [Mon, 10 Dec 2012 11:32:39 +0000 (12:32 +0100)]
Mark autotest as insignificant on mac
This test blocks unrelated changes from getting through the CI system.
Task-number: QTBUG-28505
Change-Id: I514b449ddd4cfc7c4f2fdb011b8910838aeabac7
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Alan Alpert [Thu, 6 Dec 2012 22:17:47 +0000 (14:17 -0800)]
Change qFatal to qWarning
While the process should terminate immediately with a non-zero exit code
on component error, it does that in the next line already. The main
difference is dropping the backtrace, which is not useful in this case.
Change-Id: I866ea00e62cb9d1b7c506b9819cd9bb2750ac81f
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Alan Alpert [Wed, 5 Dec 2012 20:57:45 +0000 (12:57 -0800)]
Stabilize tst_qquickpathview
The complete flick is already a long operation, so when it's delayed due
to heavy system load it can exceed 5s easily. Increase the timeout to
give the flick time to finish.
Change-Id: I333c41ea432676a8c7f6de637f6af98203cd07fb
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Christian Stenger [Wed, 5 Dec 2012 15:20:33 +0000 (16:20 +0100)]
Doc: Fix external references
Change-Id: Icf5d6a6bcfe7ef15c6e8e66d94bdd59ae6dbc904
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Alan Alpert [Fri, 30 Nov 2012 23:16:27 +0000 (15:16 -0800)]
Remove 'com.nokia' string from autotest
Change-Id: Ic318dbe7a48412e9689ca0f4506c7098d9f48b5e
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
David Schulz [Tue, 4 Dec 2012 14:35:13 +0000 (15:35 +0100)]
QtDeclarative: Add qtlinguist to the doc dependecies.
Change-Id: I1217b0df22a5f9111d22387a512d53ab0c176a17
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Stephen Kelly [Tue, 4 Dec 2012 13:27:15 +0000 (14:27 +0100)]
Use the qRegisterMetaType which does not take a string.
The string is redundant, not needed, and is at risk of containing typos.
Change-Id: I692dba07a09d4cbe8dca6ac4ac1187070b2bf59a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Stephen Kelly [Tue, 4 Dec 2012 13:24:43 +0000 (14:24 +0100)]
Declare QJSValue as a metatype where it is defined.
Instead of in multiple different TUs, therefore causing ODR violations.
Change-Id: I08d3624d3ed5a995e96488361665afa197fb9fc9
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Stephen Kelly [Tue, 4 Dec 2012 13:13:14 +0000 (14:13 +0100)]
Declare QQmlV8Handle as a metatype where it is defined.
Instead of in multiple different TUs, therefore causing ODR violations.
Change-Id: Iefc5f3486961b91dd4e97a462f72570ff49bfd1b
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Sergio Ahumada [Tue, 4 Dec 2012 10:26:08 +0000 (11:26 +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: Idc68c5c4653375b1805638b80c2a9e8f5a2cacad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Eskil Abrahamsen Blomfeldt [Tue, 4 Dec 2012 09:56:48 +0000 (10:56 +0100)]
doc: Fix remaining snippet in qml-modelviews example
The others were already fixed, but I missed this one.
Change-Id: I4a53784b474a393877c4a65bd157b807e2d52939
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Eskil Abrahamsen Blomfeldt [Mon, 3 Dec 2012 14:13:02 +0000 (15:13 +0100)]
Avoid duplicating Qt Quick Code Samples
We can't include ../../.. in exampledirs, because then qtqml
will include all in the whole repository and a bunch of them
will be duplicated in qtquick and qtqml.
Change-Id: Ib2b9776af0969baceb1e4907c79ce6cecf31f67e
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Jerome Pasion [Mon, 3 Dec 2012 15:35:35 +0000 (16:35 +0100)]
Doc: Edited qdocconfig files to change QCH titles and redirects.
Task-number: QTBUG-28341
Change-Id: Iba37adc500794f18e90f0a9dd4a765a5c90d5e10
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Alan Alpert [Fri, 30 Nov 2012 20:27:48 +0000 (12:27 -0800)]
Resume testing of customparticle
Tests were suspended pending a fix for QTBUG-24034, which was fixed
months ago.
Change-Id: I903addc8cb1206073e8e1e1532dbabc6611060b4
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Christian Stenger [Thu, 29 Nov 2012 12:48:21 +0000 (13:48 +0100)]
Docs: Fix some more references
Change-Id: I9fa1337128d91527056e3bcd26e693a19ab68eff
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Morten Johan Sørvig [Wed, 21 Nov 2012 13:26:05 +0000 (14:26 +0100)]
Qt Quick high-dpi support.
Set the device and viewport rect to the full device
pixel size. Set the projection matrix to the device
independent pixel size.
Scale shader effect source texture sizes.
Change-Id: I61dd546ff36a7ce6ad05f908796555674c714c1a
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Alan Alpert [Fri, 30 Nov 2012 22:53:37 +0000 (14:53 -0800)]
Stabilize tst_qqmltimer
Use consistent timing on the unified timer instead of qWait
Change-Id: I76c402081062f7f6849bd421e90bc96f08e8d959
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Richard Moore [Fri, 30 Nov 2012 11:16:51 +0000 (11:16 +0000)]
Fix QML XmlHttpRequest Insecure Redirection Flaw
Fix the redirection flaw in QML's XmlHttpRequest implementation that
is described in
http://lists.qt-project.org/pipermail/announce/2012-November/000014.html
Change-Id: Idfad4bc5dde6eda8840737c38e85568f3a4c0420
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Alan Alpert [Sat, 17 Nov 2012 06:32:03 +0000 (22:32 -0800)]
Update SGNode after pixmap is invalidated
If the QDeclarativePixmap on a previously valid Image is cleared, and the
scenegraph updates before the networked pixmap request returns, the
scenegraph can crash when trying to paint a now invalid texture.
Task-number: QTBUG-27795
Change-Id: I83436f846a3e965b324ff6ebf057708fe8c3b82a
Reviewed-by: Alan Alpert <aalpert@rim.com>
Andreas Hartmetz [Fri, 30 Nov 2012 15:35:45 +0000 (16:35 +0100)]
Make static QQmlProperty::read() take a const QObject pointer.
It uses the QObject in a non-const, but still logically const, way
internally. Given that the compiler disregards const for code generation
and that the QObject won't change in any way observable from the
outside, that should not be a problem.
Task-number: QTBUG-28258
Change-Id: I1a852a2597eb2ff05b421e8024e70e7ac5299627
Reviewed-by: Alan Alpert <aalpert@rim.com>
Volker Krause [Fri, 30 Nov 2012 15:09:23 +0000 (16:09 +0100)]
Compile with QT_NO_VALIDATOR.
Theses enums were apparently renamed for the case QValidator is present,
so follow this here as well.
Change-Id: Ic2a3fd5296a6dd9da356c2e5efd88f56d0843664
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Volker Krause [Fri, 30 Nov 2012 10:45:56 +0000 (11:45 +0100)]
Compile with -no-feature-cursor.
Change-Id: I47fa7b978a8087086161b1e7bde2e0b2f91fd6e5
Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Kai Koehne [Fri, 30 Nov 2012 10:22:05 +0000 (11:22 +0100)]
Qmltypes: Update plugins.qmltypes
Change-Id: I5388ece0f62a57566d7059077c88bb42e81b3238
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Eskil Abrahamsen Blomfeldt [Fri, 30 Nov 2012 11:30:11 +0000 (12:30 +0100)]
Fix example lists for Qt Quick
Snippets are fixed, the extending-examples are moved from
QtDoc, groups are used to generate the lists and I've removed
some unrelated stuff from the list of Qt Quick examples.
Change-Id: I347b6fa8a29b1cede1164fa858488f34507e1a17
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Friedemann Kleint [Thu, 29 Nov 2012 16:20:34 +0000 (17:20 +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: I1174bb0c485eeb1ffee10bb2a523d6629c57728b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Shawn Rutledge [Fri, 30 Nov 2012 10:44:52 +0000 (11:44 +0100)]
Remove the remaining usages of deprecated QWindow accessors
Change-Id: I146e7b8e3ae0ee74f5f4e3ef85f59d50a639c0f5
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Eskil Abrahamsen Blomfeldt [Fri, 30 Nov 2012 09:21:37 +0000 (10:21 +0100)]
Add calqlatr to qmldemos group and move qmldemos list
The qmldemos list has been moved to qtdoc, otherwise the links
to the documentation for the demos (in qtdoc) doesn't work.
Links from qtdoc to calqlatr in qtdeclarative works because
that's the direction of the dependency.
Change-Id: Ib275a9c7f009194a260b2e70278244afc1cedfaa
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Kai Koehne [Fri, 30 Nov 2012 09:55:07 +0000 (10:55 +0100)]
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>
Janne Anttila [Thu, 29 Nov 2012 07:42:28 +0000 (09:42 +0200)]
Made tst_QQmlDebugJS insignificant on Mac.
This test has been failing often on Mac. It seems that test case only
fails with Qt5 master integration, but not with QtDeclarative CI. This
test has now failed twice consecutive in virtualized Mac OSX machines.
Since I'm going to add some more virtual Macs to CI tomorrow morning,
making this test case insignificant to avoid good changes integrating
in additional capacity.
For more information, see the following bug report.
Task-number: QTBUG-28263
Change-Id: I3492373f4f034c27fdbc207e395a40ef96dccbd9
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Alan Alpert [Sat, 17 Nov 2012 06:37:56 +0000 (22:37 -0800)]
Remove superfluous function call
Because we just set pixmapChanged, we're certain to update the texture
in the next if block.
Change-Id: I83436f846a3e965b324ff6ebf057708fe8c3b82b
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Tasuku Suzuki [Sat, 24 Nov 2012 19:36:33 +0000 (04:36 +0900)]
Move no-Gui related QML types from QtQuick into QtQml
Task-number: QTBUG-26340
Change-Id: I9049128db2598bf3c7a9d677b774eaae53b54eb5
Reviewed-by: Alan Alpert <aalpert@rim.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Shawn Rutledge [Mon, 22 Oct 2012 14:59:25 +0000 (16:59 +0200)]
Renamed QQuickItem::pos property to position
Abbreviated property names are less descriptive so we don't have
many of them. Might as well be consistent. QWindow::pos was already
renamed.
Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Kai Koehne [Thu, 29 Nov 2012 11:39:14 +0000 (12:39 +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: I862fd442982021f26531f43b56b97f7c7b8c9c69
Reviewed-by: hjk <qthjk@ovi.com>
Gunnar Sletta [Thu, 29 Nov 2012 09:08:50 +0000 (10:08 +0100)]
Make FolderListModel available from the module overview.
Change-Id: I19c9a28b290a2ed7b3edee18583b686abf97dec0
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Gunnar Sletta [Thu, 29 Nov 2012 07:41:21 +0000 (08:41 +0100)]
Warn about potential abuse of QQuickPaintedItem::paint().
Change-Id: I9908402b3ada90497070930d43eafd433276201f
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Friedemann Kleint [Tue, 27 Nov 2012 10:19:12 +0000 (11:19 +0100)]
tr()-Fix: Do not use QObject::tr().
Change-Id: I85eb3f429d273b69270817eb4e9f1c386b5cda20
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Alan Alpert [Thu, 22 Nov 2012 03:49:39 +0000 (19:49 -0800)]
Apply full transform
Previously the particle system was only applying the translaton of the
relative transfrom from any emitters. Now the full transform is used.
Task-number: QTBUG-25518
Change-Id: I4c654837c37dbef8f6f407387ce4ea82cb3b821c
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Matt Vogt [Wed, 28 Nov 2012 22:35:00 +0000 (08:35 +1000)]
Fix mouse event distribution for Flickable with pressDelay
If an item responds to mouse events but does not accept them, it
can prevent the events from being processed by the correct item
further up the parent chain. For example, a text item inside a
mouse area can wrongly consume a press event, so that the following
release event does not yield a click when processed by the mouse area.
Rather than speculatively assigning the mouse grab to items during
event filter processing, change Flickable to retain the grab for
the duration of the pressDelay and to release it during replay of
the press event.
Change-Id: Ied12b9643838a984c7026978047465c2830e55e4
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Christian Stenger [Wed, 28 Nov 2012 17:32:31 +0000 (18:32 +0100)]
Docs: Fix some reference errors
Change-Id: Idf616d765398fe694b203dde595347f642ce503e
Reviewed-by: hjk <qthjk@ovi.com>
Gunnar Sletta [Wed, 28 Nov 2012 15:19:33 +0000 (16:19 +0100)]
Remove QML intro and QML Application Development pages
These are duplicates of the getting started document and the overviews
listed in the "Important Concents of Qt Quick".
They are also not accessible from the toplevel docs (because they are
duplicates).
Change-Id: I628d264a7738bb3b9efdaf04f3a3c1a3853688d6
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Frederik Gladhorn [Fri, 23 Nov 2012 13:37:35 +0000 (14:37 +0100)]
Mark scarc resource docs as internal for 5.0
Change-Id: Ic3e235399161dcf0c9a259a5e94b4178d61eb5cb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Erik Verbruggen [Wed, 28 Nov 2012 13:21:21 +0000 (14:21 +0100)]
Fix escape sequences in lexer: the capital X is not an EscapeCharacter.
The ECMA test suite has a test to check that none of the characters in
the English capital alphabet are escapable (S7.8.4_A4.2_T1). Or, put
differently, paragraph 7.8.4 states that only the lower-case x is
escapable and usable for a HexEscapeSequence.
Change-Id: Ie9f73726889ee9e0165c75c9b2e006a9f2b3dbda
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Gunnar Sletta [Wed, 28 Nov 2012 07:47:26 +0000 (08:47 +0100)]
Remove superflous "defining reusable components" documentation.
Change-Id: I73e6be5c7e5abe42ebf797ccfc7db5035ec4ec2c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>