aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix installation of examples.Christian Kandeler2012-11-2259-94/+218
| | | | | | | | | | Enable examples to be built in the target tree. This entails installing the project files and possibly other missing stuff. Task-number: QTBUG-27977 Change-Id: I159fd8e3ebc7077e1d68e085c4947acc058ce594 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Add designer support for animations and componentCompleteMarco Bubke2012-11-227-18/+52
| | | | | | | | | In the designer animations confuse users, if you change a state or move a item around. Also component complete is called later by the designer. The call in the VME is to early. Change-Id: I49aa04edbc49fb44ddb7b52062307982865efd7e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Fix security warning about passing a variable to printf-formatting.Friedemann Kleint2012-11-221-1/+1
| | | | | Change-Id: I7ea8ff54d24fe0818cd216d4aac0e8970461306e Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Expose QMatrix4x4 properties as mat4 uniforms in shadersChris Adams2012-11-222-0/+10
| | | | | | | | | | Previously, QMatrix4x4 properties were not exposed as uniforms in shaders. This commit adds conversion code for matrix 4x4 properties so that they are automatically converted to mat4 uniforms. Task-number: QTBUG-27952 Change-Id: I9b1de39fbbcb02743cf8c4e09b4d83c44f1dd438 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Aesthetic tweaks for qmleasing UIAlan Alpert2012-11-212-1/+2
| | | | | | | Add window title and shrink import button. Change-Id: Ic35b03c1b7d24fc4c3ca1dc237445474ecf3a213 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Unify qmleasing and easingcurveeditorAlan Alpert2012-11-2120-450/+202
| | | | | | | | | | | | Keeping the name qmleasing, but most of the code from easingcurveeditor. easingcurveeditor had more UI and functionality, as qmleasing could only import AfterEffects curves. That functionality has now been added to easingcurveeditor. Change-Id: Iac1a004f13fe33a18449af1b08bd22138d525322 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Deliver parameters to bound signals.Frederik Gladhorn2012-11-211-0/+1
| | | | | | | | | | | | | | In the following property change "mouse" would be undefined since the number of parameters was not correctly evaluated. PropertyChanges { target: mouseArea onClicked: console.log(mouse) } Task-number: QTBUG-27300 Change-Id: Ie3fb9a49155312af1feb5c7ff67d78e019925130 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Ungrab mouse upon leave event.Frederik Gladhorn2012-11-212-7/+9
| | | | | | | | | | The event signals that the mouse has left the window. This happens also when a popup is shown (overlapping the original window). Before a mouse area would still think it was in pressed state when the popup (QWindow/QMenu) was shown and even after the popup was closed. Change-Id: I6d32571f5a473610f60e9476850989ff665edb93 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Document importing issues in worker scriptJędrzej Nowacki2012-11-212-0/+3
| | | | | | Task-number: QTBUG-27454 Change-Id: Ia9f384ab92fe0c55d3299d32a3f7faba1446ce35 Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* Refactoring samegameFabian Bumberger2012-11-2010-89/+178
| | | | | | | This patch cleans up the example and makes it more customizeable by adding a setting file. Also a bug has been fixed, where the "New game" button could not been clicked. Change-Id: Ia397258721dfcf4900e3ed1e176a257eccfad354 Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* Fix syncqt-warnings.Friedemann Kleint2012-11-204-5/+5
| | | | | | | Use include with module name in the public headers. Change-Id: I50d3767a5538bc3f935ebf61b56894c8f0461981 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-20116-2213/+251
|\ | | | | | | Change-Id: Idd7a9837e4f6a1358edf9accdcdc3c71822f4c25
| * Doc: Moved all content in the doc directory.Venugopal Shivashankar2012-11-08113-2206/+247
| | | | | | | | | | | | | | | | | | - most images to the corresponding examples directory - Fixed a few broken links to the examples and qdoc pages - removed the obsolete and unused images and qdoc pages Change-Id: I18f9551b42ec713b81e3f69694a2bd04b1ebf794 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| * Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdeclarative ↵Jerome Pasion2012-11-02131-788/+1013
| |\ | | | | | | | | | | | | | | | into newdocs Change-Id: Icced038fbdb309d8928213d3753a27fe5a6b1137
| * | Doc: Removed the HTML template from the .qdocconf filesJerome Pasion2012-10-292-3/+0
| | | | | | | | | | | | | | | | | | | | | -qt-module-defaults.qdocconf already contains the HTML template. Change-Id: I8ecac8e959d0fe8705295f4c9a58dd6b98ca1a44 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * | doc: fix some typos.Alexandr Akulich2012-10-221-4/+4
| | | | | | | | | | | | | | | Change-Id: I951d89094a6d49e4c71aa9a50e98f3ccc1ca62e1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | | Fixed memory leak of registered QML modulesVadim Zakondyrin2012-11-191-0/+4
| | | | | | | | | | | | | | | | | | Change-Id: I254f755641f5ac8383e5818b5294ec85fd9236e8 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* | | Use the new QLibraryInfo::Qml2ImportsPath path for QML 2.Thiago Macieira2012-11-194-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change the environment variable to be QML2_IMPORT_PATH. This splits the imports from QML 1 (the QtDeclarative library). Change-Id: Icadbf96283b1cf071ed0deb04e8c8476da664009 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Allow margin changes during Flickable drag operationMatt Vogt2012-11-191-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the dimensions of the flickable were captured at mouse press and reused during dragging, which causes problems if the margins of the Flickable are altered during the drag. Adjust the captured values so that margin changes are correctly handled. Change-Id: I1ce608dcc1302ea8639bf18a81361b27749b217b Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
* | | Update gettingStartedQml example code to use standard Qt coding stylehjk2012-11-165-86/+80
| | | | | | | | | | | | | | | Change-Id: I225ea53a4e06e92367feb368dd6deea6f9acf403 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Use threaded renderer even without BufferQueueingOpenGL.Samuel Rødal2012-11-161-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without threaded rendering QML 2 often ends up running at half the screen refresh rate on X11. Not having BufferQueuingOpenGL shouldn't prevent us from using threaded rendering, since the issue of four animating windows running at 1/4th of the screen refresh rate will happen regardless of whether rendering happens on the main thread or in a separate rendering thread. Change-Id: I0edc818e6d762fa1faf13e7f2f47dfda132b6fdf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | Accessibility: add stepSize to value interface.Frederik Gladhorn2012-11-152-0/+6
| | | | | | | | | | | | | | | Change-Id: I4c654837c37dbef8f6f407387ce4ea82cb3b821b Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | | QuickTest: Remove reference to /tests/qmlautoKai Koehne2012-11-141-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | There's no tests/qmlauto in the source tree, neither could I find an example using QUICK_TEST_SOURCE_DIR. Task-number: QTBUG-27919 Change-Id: I5a4ba5653a06e448a922a47900ae3f2d12e3020c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Fix StocQt example - need full 4-digit years for yahoo APIShawn Rutledge2012-11-131-2/+2
| | | | | | | | | | | | | | | Change-Id: Id5f6895c3e4c901af3e4e45ca8a1474c9fdb19d9 Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* | | Deduplicate checking of conditions.Alexandr Akulich2012-11-121-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I0621db17db2bb8fe885a3a65f6a7a042279c3752 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | Improve documentation.Frederik Gladhorn2012-11-101-3/+4
| | | | | | | | | | | | | | | Change-Id: I9bfb8bf8167e3b55d3539dc35e4278b5514119c8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Preparation for changing QWindow::windowState to visibilityShawn Rutledge2012-11-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | QQuickWindow needs to avoid depending on QWindowPrivate::visible. It can go back to using private variables after the replacment is done. Change-Id: I38b99df8b4ef0139c9eadcbb07d33d3f1894a8ac Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Window example tests Qt.application.supportsMultipleWindowsShawn Rutledge2012-11-101-1/+3
| | | | | | | | | | | | | | | Change-Id: I7fcdd518e56427316f454ff4e5b298d13b396ac0 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Blackberry: Workaround for GLSL compiler bug.Fabian Bumberger2012-11-092-0/+10
| | | | | | | | | | | | | | | Change-Id: If3ce968c0a0a2af4244671fe028a560843c9016a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | Examples and fixes for QML Window propertiesShawn Rutledge2012-11-094-17/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | Setting Window.color in QML takes effect immediately. It was only possible to set the property at startup. Examples demonstrate new Window property features. Change-Id: Ic5b43d0d84371f3fe5c42223ccc98e6de27aed10 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Renamed QWindow::pos property to positionShawn Rutledge2012-11-092-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Abbreviated properties are to be avoided, and this is a new class so we have a good opportunity to avoid it before the release. Related to qtbase change I19c00b54b1d2712f9418e8bcf56e35a8008b89ef Change-Id: Ibd5cd10814c8cbd2b1f6e49b70782c7768d2366d Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Install the Qt Quick 2 examples in the "qtquick" dirThiago Macieira2012-11-0943-87/+87
| | | | | | | | | | | | | | | | | | | | | | | | Leave the "qtdeclarative" dir for Qt Quick 1, which is where it used to be in Qt 4. Change-Id: I44997771d77617564fc608c1aba95e3ada8f9a69 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* | | Don't install tst_qmltest to $QTDIR/testsKai Koehne2012-11-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to install the tst_qmltest by default, since it will install itself to $QTDIR/tests. Task-number: QTBUG-26661 Change-Id: I310f660cc486ffb4358af14ea15db389375ed802 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* | | tests: Mark some tests as insignificant on MacSamuli Piippo2012-11-092-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-27890 Change-Id: I48edea29ccaa593e4bab61c1a968130a5d3457f3 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* | | Expose "Qt.application.supportsMultipleWindows".Samuel Rødal2012-11-092-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful on platforms like kms and eglfs that only support a single QWindow. On those platforms the QML application can thus choose to use a Rectangle instead of a Window to show dialogs etc. Change-Id: Idc3f46d2cad6cf3f55c5c84df2c8511407bd4849 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* | | Don't use design metrics with NativeRendering on TextInputEskil Abrahamsen Blomfeldt2012-11-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only set the design metrics property in init(), before the renderType has been set. Since updateLayout() is called every time the renderType changes, it should be sufficient to set it there. Change-Id: If5b2cb3738e8135195848857a30f4e646bdf1d0b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | | All QWindow properties that have "window" in them have been renamed.Shawn Rutledge2012-11-0826-183/+202
| | | | | | | | | | | | | | | | | | | | | Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Fix compilation issue with clang in C++11 mode.Erik Verbruggen2012-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As with all other qHash functions, providing a default value for the seed is needed. Compiler error: In file included from qml/v8/qv8engine.cpp:42: In file included from qml/v8/qv8engine_p.h:57: In file included from /Users/erik/dev/qt5-stable/qtbase/include/QtCore/qvariant.h:1: In file included from /Users/erik/dev/qt5-stable/qtbase/include/QtCore/../../src/corelib/kernel/qvariant.h:50: In file included from /Users/erik/dev/qt5-stable/qtbase/include/QtCore/qhash.h:1: /Users/erik/dev/qt5-stable/qtbase/include/QtCore/../../src/corelib/tools/qhash.h:107:35: error: no matching function for call to 'qHash' Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(t))) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~ [skipping macro expansion and candidate qHash functions] qml/v8/qv8engine_p.h:89:13: note: candidate function not viable: requires 2 arguments, but 1 was provided inline uint qHash(const v8::Handle<v8::Object> &object, uint seed) Change-Id: I917785ce5ce596757fe06ced1536797090bb0f77 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | | When declarative debug tests fail in CI, confirm timeout as reasonShawn Rutledge2012-11-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Hope to correct errors like FAIL! : tst_QQmlInspector::reloadQml() 'QQmlDebugTest::waitForSignal( m_client, SIGNAL(responseReceived()))' returned FALSE. () Change-Id: Iebf29d4de0bc19396041565e5a4cd32561345235 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | Fixes the examples shared macro.Caroline Chao2012-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detection of the platform's name Mac was wrong. Task-number: QTBUG-27894 Change-Id: I3194fac4e78d12682871dec63a905b4c940fb80c Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | | Prevent crash when doing threaded rendering of multiple windows.Samuel Rødal2012-11-082-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't call renderSceneGraph() on non-renderable windows. We also don't call syncSceneGraph() on them, which is where the renderer will be set. Also get rid of harmless warning about non-renderable windows. Change-Id: I24739abefe0d554efb568514057719f981590c28 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | | Examples separated out of Ie808e78a42074e13aa9d3c87723ec9ac8fdbaf4av5.0.0-beta2Shawn Rutledge2012-11-074-14/+149
| | | | | | | | | | | | | | | Change-Id: Iec54ed5d7c41c6103ddfe07509b905914806d435 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | qmlscene can start with either an Item or Window as the qml rootShawn Rutledge2012-11-056-33/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, it assumed that the root is an Item and needs to have a Window created. But it's useful for an application to have a Window as the root, and it was already possible by writing a different C++ main function (see qtdeclarative/examples/window/window/window.cpp). It doesn't take much to give qmlscene this flexibility too. Change-Id: Ie808e78a42074e13aa9d3c87723ec9ac8fdbaf4a Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | QQmlPropertyCache: adding setParent()Thomas Hartmann2012-11-052-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setParent() enables to dynamically set the parent of a QQmlPropertyCache. This is used in the Qt Quick Designer to create dynamic properties on an arbitrary object. Change-Id: I0dafabcacf4222fc1bfe693736cbd23e1e928e8f Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* | | Fix a missing word in the docsJan Kundrát2012-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The functionality is "*no* longer available", of course. Change-Id: I2c9f2633d74b98c16216f68e3d7e080422cf6506 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | | transformOriginPoint is deprecatedShawn Rutledge2012-11-051-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-26423 Change-Id: I28f8160c2c52f62ef901ed569b94fefdab387729 Reviewed-by: Alan Alpert <416365416c@gmail.com>
* | | Fix conditional jump based on an uninitialized value.Jędrzej Nowacki2012-11-021-1/+1
| |/ |/| | | | | | | | | | | | | QElapsedTimer is POD and it is not initialized by default. Change-Id: Ie6997e1c4225b9ba584de52cc0c9647f26e45438 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | follow qt_tool.prf now setting up DESTDIROswald Buddenhagen2012-11-016-11/+0
| | | | | | | | | | Change-Id: Ia07dc830586fd30f4ee98c64e9f2accae5cf2f06 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | adjust to qt_plugin.prf changes, part 2Oswald Buddenhagen2012-11-015-19/+0
| | | | | | | | | | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. Change-Id: I2dab25a2527d376eaa37f233782ffe4b6a58b8f8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Update Nokia references to Digia's.Caroline Chao2012-11-012-2/+2
| | | | | | | | | | | | Change-Id: I3be91d4a6a1116c79ab6aca89d189c88a265d339 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 00:22:36 +0000