aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: declarative-colors.png not visible in qmltypereference.qdocv5.0.1Nico Vertriest2013-01-281-0/+0
| | | | | | | | 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>
* Doc: corrected path to snippetNico Vertriest2013-01-281-1/+1
| | | | | | | | Added "quick" to path in imageparticle.qdoc Task-number: QTBUG-29101 Change-Id: If328cde08f46b720defa1953916753ba9d9836a8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* fix qmltest example install pathOswald Buddenhagen2013-01-281-2/+2
| | | | | Change-Id: I267155bb34b8226331fc2951521dc7b8643a014c Reviewed-by: Alan Alpert <aalpert@rim.com>
* mark forgotten EXAMPLE_FILESOswald Buddenhagen2013-01-282-0/+6
| | | | | Change-Id: I83c7706479ea3afd45ab9c97f63f68d416b28f55 Reviewed-by: Alan Alpert <aalpert@rim.com>
* fix installation of qmltestcase exampleOswald Buddenhagen2013-01-281-3/+18
| | | | | | | | | | | 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>
* Doc: Add QML Types to table of contents in AssistantTopi Reinio2013-01-251-1/+1
| | | | | | | | | | | | 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>
* Doc: Updated change log with documentation entryJerome Pasion2013-01-241-0/+1
| | | | | Change-Id: I1cd4dc70265f2425045328910be12a0cfaeb795c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Remove outdated macro usageChristian Stenger2013-01-246-11/+7
| | | | | | Change-Id: I4b58f3d74d7dec9a95a07b907c500990630e7762 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Doc: Fixed "QML Types" node in AssistantJerome Pasion2013-01-221-1/+1
| | | | | | | | | | 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>
* Avoid race condition in QQuickTestsGunnar Sletta2013-01-171-1/+2
| | | | | | | | | | | 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>
* Exporting required symbols for Qt Quick DesignerThomas Hartmann2013-01-177-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Update changes file for 5.0.1 releaseSergio Ahumada2013-01-121-7/+21
| | | | | Change-Id: I704cc948c37af639d9686c783a5341e2ab89903e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada2013-01-122-2/+2
| | | | | Change-Id: Id101dc3a7ab5d2552531b7ea1819e0f2be725989 Reviewed-by: hjk <qthjk@ovi.com>
* test examples only in developer buildsOswald Buddenhagen2013-01-111-1/+1
| | | | | | | | | we don't want to actually build examples in production builds any more, so the test is bound to fail. Change-Id: I9adda2d147a05eb7acb3a864c81b8d0c0333c8bb Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge branch 'stable' into releaseSergio Ahumada2013-01-0989-472/+1152
|\ | | | | | | Change-Id: I44631ce9d9a6aba090d01911ff62b56043510c9c
| * Don't try to grab Windows with invalid or a zero sizeDominik Holland2013-01-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | It will end up in LiveLock trying it. Because the Window will never appear in the Rendering thread and setting the grabContent. On the other end, grabWindow will never return because it waits for the RenderingThread to set grabContent Change-Id: Ia1c365acf033732b3e2e9d9d7dc8e73f9e8f4870 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * Fix tst_qquicktextinput on Windows and Mac.Friedemann Kleint2013-01-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Both require a sensible window size. Task-number: QTBUG-23485 Task-number: QTBUG-28611 Change-Id: If888dd4d60fccdabc9856f914d6542ced6a41d64 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
| * Documentation for scene graph examples.Gunnar Sletta2013-01-0713-68/+484
| | | | | | | | | | Change-Id: Idb39fc0b6d5e538b90ae8a0b98d9f4d77e1fb617 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Accessibility: Send value updatesFrederik Gladhorn2013-01-042-0/+10
| | | | | | | | | | Change-Id: I090dc8427e478416bf1bbe910db1f98d9bce3fb8 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * Modify qmlscene usage text to be consistentRichard Moe Gustavsen2013-01-041-4/+4
| | | | | | | | | | | | | | | | - last line was not aliged correctly with the previous lines. - usage of capital letter was inconsistent. Change-Id: Ied7caab8296a635e105764bc2e95aa9e78f1cfcb Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Accessibility: Work with QQuickWindowFrederik Gladhorn2013-01-044-29/+37
| | | | | | | | | | | | | | | | | | | | | | Before we would only be accessible when QQView was used. While the window has the content item, that one will not appear in the hierarchy of accessible objects since it has no valueable properties to expose. Instead it's first child will be used (which was the case before when QQView was used). Change-Id: I03cefb5c8dcd8296d51ff2bfcb677386a5f1d698 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * Improve example with key navigation.Frederik Gladhorn2013-01-044-31/+101
| | | | | | | | | | | | | | Generally this is a redo of many of the details. Change-Id: I08c4f58966507232220bb10892041b9e39d54e37 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * Revert "Mark autotest as insignificant on mac"Paul Olav Tvete2013-01-031-2/+0
| | | | | | | | | | | | | | | | | | | | | | 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>
| * qmltest: Added the possibility to use QApplicationLiang Qi2012-12-312-6/+30
| | | | | | | | | | | | | | | | | | | | | | 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>
| * Add changes-5.0.1 fileSergio Ahumada2012-12-241-0/+56
| | | | | | | | | | | | Task-number: QTBUG-26065 Change-Id: I3345a178cdfbc8e8c68b0e069eb9928772353186 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Bump Qt version to 5.0.1Sergio Ahumada2012-12-232-8/+8
| | | | | | | | | | Change-Id: I8cadaec38aff1348c80c552e7fe072b6a7aa31b1 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Fix other warnings in qtdeclarative found by GCC 4.7Thiago Macieira2012-12-237-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Fix warnings in QtQml due to ?: with enums of different typesThiago Macieira2012-12-231-25/+25
| | | | | | | | | | | | | | | | 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>
| * Add qmake generated files to .gitignore.Miikka Heikkinen2012-12-211-0/+3
| | | | | | | | | | | | | | | | Add source files generated by qmake for automatic static plugin imports to .gitignore. Change-Id: I4c5488bdc146f501963f5414017ba80d781210ef Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Quick tests: Introduce QQmlMessageHandler.Friedemann Kleint2012-12-2014-204/+140
| | | | | | | | | | | | | | | | | | | | 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>
| * Fix compiler warnings in declarative tests.Friedemann Kleint2012-12-2012-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * Do not crash on some animation changesAlbert Astals Cid2012-12-202-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Compile with QT_NO_WHEELEVENT.Volker Krause2012-12-1916-1/+39
| | | | | | | | | | | | | | | | 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>
| * Accessibility: Improve interface handling in QuickFrederik Gladhorn2012-12-196-49/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Stabilize QQuickLoader test on Windows.Friedemann Kleint2012-12-191-0/+2
| | | | | | | | | | | | | | | | | | Wait until the component is ready in network tests. Task-number: QTBUG-28611 Change-Id: I3f880ee585199a3c8ba2d672bb365fa60c472499 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| * Fix tst_qqmlbundle on Windows.Friedemann Kleint2012-12-192-1/+2
| | | | | | | | | | | | | | | | | | | | 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>
| * Fix tst_qqmllanguage for MSVC.Friedemann Kleint2012-12-182-6/+4
| | | | | | | | | | | | | | | | | | Do not use \u. Task-number: QTBUG-28611 Change-Id: I85fce2f945c97421b8b35fb8276cd4ee3cc19d38 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | point dependencies to 'release' branchesSergio Ahumada2012-12-181-3/+3
|/ | | | | | Change-Id: Iac26a66556eed1428a36cf7288167594a67e3590 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Enabling Qt QML linking to Qt Quick.v5.0.0Jerome Pasion2012-12-171-1/+1
| | | | | | | | Allows Qt QML pages to link to Qt Quick. Task-number: QTBUG-28579 Change-Id: I9eafadc5ee14a5588a5863960c4463132b73b287 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* remove obsolete DEPENDPATH assignmentsOswald Buddenhagen2012-12-162-2/+0
| | | | | | | | qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: I6cefdd70ffd3a0ef889752eafec8b999822588cf Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-1613-14/+10
| | | | | | | | 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>
* Add a hidden XandYAxis enum valueAlan Alpert2012-12-1519-22/+22
| | | | | | | | | 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>
* Add minimal plugin importing to quick2 qmlplugindump toolMiikka Heikkinen2012-12-141-0/+2
| | | | | | | Task-number: QTBUG-28131 Change-Id: Iad55e3c6057b060cd8f8233e02a6151c91cc32ed Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fixed samegame tutorial part 4 to reflect Quick2 stateOliver Wolff2012-12-143-20/+28
| | | | | | Change-Id: I61a3d63bc0268256ff6497339a6d97719a59860f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Improved cosmetics for StockQtJens Bache-Wiig2012-12-138-45/+76
| | | | | | | | 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>
* Clean up the StockQt demoJens Bache-Wiig2012-12-1310-789/+726
| | | | | | | | | 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>
* Fix StocQt buttonsAlan Alpert2012-12-124-155/+124
| | | | | | | | 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>
* Update porting docsv5.0.0-rc2Alan Alpert2012-12-121-1/+10
| | | | | | | | | | | 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>
* Change virtual folders in .qdocconf to qtqml and qtquickhjk2012-12-122-2/+2
| | | | | | | This seems more in line with the rest of the qdocconf files Change-Id: I91999205b0632a2c0e57f428754cf5928a1ea6c7 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Add \brief comment to Custom Geometry examplehjk2012-12-121-1/+1
| | | | | Change-Id: I11be2329d2d396bc778a5eeda45dda9b30337285 Reviewed-by: Eike Ziller <eike.ziller@digia.com>