aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Cosmetic changes in DefaultFileDialog and dialog shared controlsShawn Rutledge2013-03-186-61/+40
| | | | | | | | | Implementation of the button for QML-based dialogs matches the one for QML examples. The button and the text field use system palette colors, as does the file dialog. Change-Id: Ibf45d57bdab8799ae6aa69ba543c0e05c55b01d3 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Fixed invalid GLSL in openglunderqml example.Samuel Rødal2013-03-181-1/+1
| | | | | | | | First argument to pow is not allowed to be negative. Task-number: QTBUG-30191 Change-Id: Iac6c25d84e26777564d6741690aab552a0bb513e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* QQuickLoader: fix the recursion guard for size updatesJ-P Nurmi2013-03-173-3/+35
| | | | | | | | Task-number: QTBUG-30183 Change-Id: Ic8720e1e35bf2f349d74d2021dd202849da67852 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* optionally bootstrap QmlDevTools and qmlminOswald Buddenhagen2013-03-165-17/+19
| | | | | | | | | QmlDevTools is really meant for host tools (the two only ones using this being qmlmin in this repo and lupdate in qttools). qmake magic will take care of bootstrapping them while x-building. Change-Id: I29d921af483659d5455be0ad080dc1a88540c036 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* improve dependencies of qmlparser testOswald Buddenhagen2013-03-162-2/+2
| | | | | | | | | | | first, this doesn't need gui. second, use qml instead of qmldevtools - there is no need to use the static library here, and after bootstrapping it would pose a real problem (testlib is not bootstrapped). on the downside, this makes the test rely on private_tests. Change-Id: Ic550fa05dcd0f3ba333850640a5b7e3fdd47d905 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Create common base class for declarative dialogsShawn Rutledge2013-03-1515-330/+581
| | | | | | | | QQuickAbstractFileDialog inherits QQuickAbstractDialog, and so can the future platform dialog types. Also some header comment corrections. Change-Id: I86bc6d975223979c19d94a3fd70e4b5130b73f47 Reviewed-by: Liang Qi <liang.qi@digia.com>
* photosurface example: simplify PinchArea usage; fileUrls; licenseShawn Rutledge2013-03-151-41/+33
| | | | | | | | | | FileDialog.filePaths was changed to fileUrls. No need to do so much scripting because the PinchArea.target takes care of the math already, and with better rotational symmetry too. Example QML should have a BSD license. Change-Id: I892292574c81c032d948c1c2d4924fc7127dd008 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Add TextEdit::selectByKeyboardJ-P Nurmi2013-03-156-3/+184
| | | | | | | | | The main use case is for enabling text selection by keyboard for read-only editors. Change-Id: Ieaa9af366fd0eaf863a104a2fdf33c9ddad38b10 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* QQuickWindow: expose activeFocusItem as a propertyJ-P Nurmi2013-03-152-0/+12
| | | | | Change-Id: Ifd393399f93b04313cd66d7873fb99b505640c8a Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* QQuickView's equivalent in QtQuick1 is QDeclarativeViewDebao Zhang2013-03-151-1/+1
| | | | | Change-Id: I12104e8bd58a406a0ff03c110e2df54bbc1c816c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Move QML types to types folderAlan Alpert2013-03-1427-35/+36
| | | | | | | | | The QtQml module has gain a bunch of QML types cluttering up the qml folder. Moving them to types organizes them a bit better. Change-Id: I570884c00f4abc48f4f1aea048bf002bc70223f3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Cosmetic changes in common controls for examplesShawn Rutledge2013-03-149-198/+131
| | | | | | | | | Use system palette colors. SimpleLauncherDelegate has its own "button" rather than using the shared one, which really wasn't suitable for any other purpose. So now example apps can use Button, and ToolButton isn't necessary. Change-Id: I632397f36b96a26c32a86301ddacb85d5c3221f0 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Add some docs, improve scope of var.Frederik Gladhorn2013-03-142-1/+11
| | | | | Change-Id: I62e0b3bb4882f58ba58b3c8d71679e4ad2dbc5a3 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-1433-5086/+186
|\ | | | | | | | | | | | | Conflicts: tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro Change-Id: I2fd99ed8bd03302b9bbf31e6f21990f6455c4f1c
| * Fixed tutorial gettingStartedQml part5.Libor Tomsik2013-03-131-5/+5
| | | | | | | | | | | | | | In FileDialog.qml the selector GridView.view.currentIndex does not work, replaced with dirView.currentIndex Change-Id: I7c1893ce3872c41fc4f0fd63bad0e6a2cff2b207 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Stephen Kelly2013-03-131-0/+2
| |\ | | | | | | | | | refs/staging/stable
| | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-03-121-0/+2
| | |\ | | | | | | | | | | | | Change-Id: I9f54f308efc4d165d091f215d0b031e4e895d749
| | | * define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: I03ce9975ede5cff53e976409e2fabff1f56e1ea9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | * Merge branch 'stable' into releaseJohanna Aijala2013-02-212236-2800/+10167
| | | |\ | | | | | | | | | | | | | | | Change-Id: I13e80072db1e2c14a37b6a123276be81b085e87e
| * | | | Doc: Changed section title in whatsnew.qdocJerome Pasion2013-03-131-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - "Qt 5.0" is the name of the main landing page, which causes link conflicts in Qt QML module. Change-Id: I2becb864873ea3784eb4fece3ebcbe64e0a00cba Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| * | | | Makes QSmoothedAnimation respect zero duration.Thomas Kristensen2013-03-133-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In automated GUI test scenarios it often desired not to wait for animations before verifying a result, so setting the duration to zero should accomplish this, before this patch; if duration was set to zero QSmoothedAnimation would treat it as if duration was not set, and used velocity to calculate animation speed. Change-Id: Ia57f1c9ffdd2056ac7c85d1cb94dbd3835fcbb7a Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
| * | | | Fixed text opacity when using Text.NativeRendering.Yoann Lopes2013-03-121-1/+1
| |/ / / | | | | | | | | | | | | | | | | Change-Id: I76922074c02c368f8a8a6998c478a33537e9a6e8 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | | make the sample code more consistent in contextXingtao Zhang2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id831032a937bf07b70515e95ff481ea8a741edeb Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | | Improve the ordering of Flickable dragging and moving property updates.Andrew den Exter2013-03-123-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the contentItem after the dragging and moving properties have been updated so they return the correct values from the onContentYChanged and onContentXChanged handlers. Task-number: QTBUG-30032 Change-Id: I15716dc8eee4d9836f96362a8b49f1d0c404b0c2 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * | | Improve timer dependent tests.Frederik Gladhorn2013-03-1110-5014/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_QQuickLoader::loadedSignal depended on sharing the engine with simultaneousSyncAsync and that function being run before it. After each test run call clearComponentCache() as that is important for caching of the network tests. The test server would send the item after 500ms. Sometimes the CI would be faster or slower. Instead of relying on timing, simply call a function when the reply should be sent. Change-Id: Ifb0447041197e1cba103570597a62a2510d31aab Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * | | Fix warning about uninitialized value in QML-ECMA-test (CLANG).Friedemann Kleint2013-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifcc3ef0e0e65245758697d7302e8227bb6e748f7 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * | | Fix warning about use of uninitialized value in QML-debug helpers.Friedemann Kleint2013-03-111-14/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifcba9c1224dfa7db069ef71b1bb39e3c7658a7b5 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
| * | | Fix warning about adding int to a QString (CLANG).Friedemann Kleint2013-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibc84dcbe5ca4519bb1ac25e5d5463ef58c48190e Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * | | Simplify function with early return.Frederik Gladhorn2013-03-111-30/+31
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic0e1a32f6c586e75fb7389ef8009e56881942cf1 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| * | | Stabilize tst_qquicktextinput::remoteCursorDelegate()Frederik Gladhorn2013-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases QCOMPARE(component.status(), QQmlComponent::Loading); (line 2800) is failing -- it appears to be Ready immediately. Add a delay to ensure it always hits Loading before Ready. This is a backport of change: I975f3b3ea6004f178a7b0fb21193dcbdaf483157 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Backported since the test keeps on failing for the stable branch. Change-Id: Ic90f1fc3de3e0a0ee75026cbebf8d99304a67b98 Reviewed-by: Michael Brasser <michael.brasser@live.com>
| * | | Fix TextEdit::persistentSelection docs (false by default)J-P Nurmi2013-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I3576e08b2bf159250a163466f1402952c7520e8b Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * | | Mark flaky tst_qv8profilerservice test as insignificant on MacKai Koehne2013-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29975 Change-Id: Ia80fab4342c365e08fde56812bd331ee7ce13bc7 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * | | GridView: fix resetColumns() to calculate the amount of columns rightJ-P Nurmi2013-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29822 Change-Id: I3649398f3d283bc2781daa6b3071538414653e6d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * | | Use qmake for package dependency resolution in cmake tests.Stephen Kelly2013-02-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to remove hardcoded depends information. Change-Id: Ia2b364a65484a2d99320cc3d45cfcbb5a0b68c6e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * | | Fix headers without Qt module directory name in their includesJosh Faust2013-02-254-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed headers to include the Qt module directory in their #include directives, e.g. <QtCore/QObject> instead of <QObject>. QTBUG-29797 Change-Id: I6f61973deb4e48158d3eff896afd81ca4b8ae960 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | | | Compile fix.Samuel Rødal2013-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some compilers don't allow the first argument to printf and similar functions to be a non-literal string. Change-Id: Idd11ae6679d5c0585b5d10b76c991dcfdb4f65da Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | | | Polish usage of a QElapsedTime instance in QSGThreadedRenderLoopJędrzej Nowacki2013-03-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch should make valgrind happy, by not using an uninitialized memory. Change-Id: Iec7f16c56f250dd121a37f03da4cfc5d9e5c0742 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | | | Fix usages of \since for QML itemsThomas McGuire2013-03-135-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | \since uses the QML import, not the Qt version. When adding a new property, it needs a REVISION argument and the type needs to be registered again for the new version. Change-Id: I2e636e9d26c8e989729eadad2ef73a836c35caa1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | | Documentation and versioning for new Window propertiesShawn Rutledge2013-03-133-3/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even some of the properties that existed in 5.0 were not documented. Change-Id: I25a14b9b19425a6c792d06bc41983e9abd1d17d0 Task-number: QTBUG-29807 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | | | Abort rendering when QOpenGLContext::create/makeCurrent fails.Gunnar Sletta2013-03-131-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-30158 Change-Id: Ic8239fe6f074c989e4474d46042e1a82796b4908 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | | don't use CamelCase includesOswald Buddenhagen2013-03-138-26/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they are not available during bootstrap. Change-Id: I5e941f22cd2b9fa622730ba0bf8389394f6a30a5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* | | | Add QtQml.Models moduleAlan Alpert2013-03-1241-345/+827
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The moved Model classes can now be exposed in a QtQml import. To keep the QtQml import resticted to more core functionality, they are being exposed in a plugin module. Change-Id: I0a84642a72c7c9bbf9b6ffd2a6c33549f8e61c29 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | | Fix remote image loading for AnimatedSpriteAlan Alpert2013-03-123-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Sprite generated behind the scenes had no QmlEngine associated, and the engine is needed by QQuickPixmap for async loading. Task-number: QTBUG-28086 Change-Id: Ibf3b03c54b339fe8f44201dc6fcb507e5274bbec Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | | | Fixed some auto testsBernd Weimer2013-03-122-53/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the listmodel test an error description was not converted to a string. In the pathview test, number literals are always interpreted as double, but qreal can also be float, which lead to failing tests. Constructor usage prevents "expected data of type 'float', got 'double'". Change-Id: I0c760486de0ba4df6a5e9a33e9528ca7d7a1a63e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | | Fix QString usage in createPixmapDataSync().Friedemann Kleint2013-03-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Warning introduced by 707bbe5dea9d7398b205124a54422f2fafb6f151 . Change-Id: I20f0da00ea519cc2ec82a1d13f1887c099a3947c Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | | | Disable accessibility temporarily.Frederik Gladhorn2013-03-122-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required to update headers in QtBase. Change-Id: I373a1f13dcde8ce1cafeedb5cd2269a0f8f3a670 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | | | Fixed incorrect vsync delta time in QSGThreadedRenderLoop.Yoann Lopes2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I32bb720e9c9aa0278959dd64e5e1c449bdace7d1 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | | | Introduce QML_FBO_FLUSH_BEFORE_DETACH to work around FBO issue.Michael Brasser2013-03-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some AMD hardware, detaching the depth attachment immediately after rendering to an FBO will cause rendering issues. Adding an explicit glFlush before detaching seems to work around the issue. Task-number: QTBUG-29265 Change-Id: I97c7b87c1c3d3a69a4d6228dd9459745710c5f4c Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | | | Use official V8 string manipulation methods in QMLPeter Varga2013-03-123-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QtJSBackend's String::GetCharacter and String::Equals methods are Qt specific and they are not supported by official V8. These methods can be replaced by more "V8-friendly" implementations in QtDeclarative. Thus the mentioned methods can be removed from QtJSBackend to reduce the difference between QtJSBackend and the official V8 source. Change-Id: I5590ca62dc667e64a7f54a7e47a02d350ba0c077 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | | correct misspellingShawn Rutledge2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Canceled Change-Id: Ie080e5be4af0cf60cab56e906f82fb6e7b32c6e3 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 10:49:41 +0000