summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* QtQuick1: fixed qperformancetimer testChristiaan Janssen2012-10-013-16/+11
| | | | | | | | It wasn't included in the autotests, and did not compile due to missing defines in the makefile. Change-Id: Ie1e3790422e6c1af2948b1edc38a72e2f8d543ed Reviewed-by: Fanda Vacek <fvacek@rim.com> Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* QDeclarativeTrace patch for a custom trace instanceFrantisek Vacek2012-09-286-7/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for the BB10 Cascades profiling. There are more reasons for introducing this patch: 1) Cascades do not use QtGui library for QML rendering. It has its own paint engine with client-server architecture. Profiler traces are sent asynchronously from non Qt renderer thread to the Qt client. The QPerformanceTimer has to be patched too, cause we need to know time difference between tracing zero time and some time in past, see: qint64 QPerformanceTimer::elapsed(qint64 to_monotonic_time_ns) const 2) Since we need more sophisticated trace engine in cascades, this patch allows explicitly assign custom class derived from QDeclaraqtiveDebugtrace to the trace framework. If no custom instance is assigned, the default QDeclarativeDebugTrace instance is created implicitly on first trace request. Using custom trace instance which is not part of Qt (it is part of libbbcascades) allows us to implement all Cascades trace special needs in libbbcascades and not to carry Qt with the platform specific code. 3) The NO_CUSTOM_DECLARATIVE_DEBUG_TRACE_INSTANCE macro is introduced to allow custom trace engine only on the bleckberry platform, see declarative.pro. If this macro is defined Qt compiles from its original code. 4) Possibility of custom QDeclaraqtiveDebugTrace instance might be usable for other projects which needs to extends somehow default Qt trace functionality. 5) Patch is not intended to be applied to Qt Quick 2, since declarative debugging infrastructure is changed there. Change-Id: I199211c1de66e930e252e8c033503d7f4940565f Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Add QtQuick1 WebKit integration (from QtWebKit module)Simon Hausmann2012-09-2726-3/+842
| | | | | | | | This adds the QML1 QDeclarativeWebView integration to the default build (it was added a while ago) as well as the unit tests. Change-Id: I7324f5a3b00716d4b300e8c11d9ea3b8b9577da3 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Mark qtextdeclarativetextinput test as insignificantSimon Hausmann2012-09-271-0/+2
| | | | | | | | Task-number: QTBUG-27364 Change-Id: I35d23837896a87be371712023388da14e8a228c5 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Remove qtXXXversion.h from gitignoreThiago Macieira2012-09-251-5/+1
| | | | | | | These files are not generated anymore Change-Id: Idf470ff4775d0c9775a9df7c115d79f986444e8c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-241372-21055/+21055
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I11a957e35758e821269478ebc91e87f0f5ebc4d5 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Remove Symbian platformKai Koehne2012-09-18187-1608/+64
| | | | | Change-Id: Iad770614f7c1c890febeee662d0ce9370dcb17e3 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* qmlplugindump: Update help outputKai Koehne2012-09-181-1/+1
| | | | | | | We dropped the 4.7 import a while ago. Change-Id: I8ae8d11b890374c3ec6e87556a7de1f064d37f38 Reviewed-by: Christian Kamm <kamm@incasoftware.de>
* Compile & install qmlplugindump by default (again)Kai Koehne2012-09-172-27/+5
| | | | | | | | | qmlplugindump is still needed for QtQUick1 modules, since the one in qtdeclarative will choke on the QtQuick1 dependency. Therefore revive qmlplugindump in here, but name it qml1plugindump. Change-Id: I975621cff4758ab71e165eb3f6398d70a1f154be Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Use qInstallMessageHandlerKai Koehne2012-09-1410-53/+51
| | | | | | | qInstallMsgHandler got deprecated in Qt 5. Change-Id: I87f5f8d5b28afcbcf8a9c613d1d4b1199f5f4254 Reviewed-by: Martin Jones <martin.r.jones@gmail.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-112-2/+1
| | | | | Change-Id: I627dfef54743821d0c3019034f114ac4d81fda76 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* qmlplugindump: Fix compilation againKai Koehne2012-09-101-24/+18
| | | | | | | Apply changes done to qtdeclarative/qmlplugindump here, too. Change-Id: I55c99fb0ad499c5cb59dda33e320702c0d4722ea Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* Avoid usage of deprecated QInputMethod::inputItem() in testsPekka Vuorela2012-09-072-6/+11
| | | | | Change-Id: Ie6e37ab23b1bef99d294fe8a0acd95429a37a527 Reviewed-by: Joona Petrell <joona.petrell@gmail.com>
* Compile without xmlpatterns again.Daniel Molkentin2012-09-051-0/+1
| | | | | Change-Id: I1cb9d92c60e8595432c1a13866c370e040553a6f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Register Qt 4.7 import on-demand, instead of at startup.Robin Burchell2012-09-039-73/+124
| | | | | | | | | | | | | | | | | | | | This is a slightly less awkward approach (keeps backwards-compatibility) while speeding up startup for applications that don't use the old import path. Also prints a warning to let developers know they should migrate their code when possible. Completely disabling the Qt 4.7 import is still possible by setting QT_NO_IMPORT_QT47_QML. This takes around 10-15ms off a very simple "hello world" on my macbook. As an added bonus, forward-port a similar approach to 4.8's a26f545d8e25af74fb43d16c9afa79f6e04463e7 and don't register graphical types in a non-graphical application as someone (very naughtily) apparently forgot to get it integrated to Qt 5 first. Change-Id: I7821523750b3ab6770f367788725d0da70c5ec1f Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Update the git-archive export optionsThiago Macieira2012-09-032-0/+4
| | | | | | | | | | | | | | The .gitattributes and .gitignore files do not need to be present in packaged sources, as they are for people using the Git repository. People who download tarballs usually don't reimport into Git -- they should just download the actual repositories. Meanwhile, the .tag file is quite useful. Instead of making Git extract to the useless SHA-1 of the $n string, ask git-archive to store the SHA-1 of the commit being packaged. Change-Id: I05ad98586d5ce38bb499d7bb4a4d09ee81cefd4b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Use CONFIG+=quick1_debug in pro files to activate debuggingv5.0.0-beta1Kai Koehne2012-08-245-5/+5
| | | | | Change-Id: I63cc45662e8f1ac5979ac8cf2ba8c76b42c45895 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Unskip test that's no longer failingKent Hansen2012-08-221-2/+0
| | | | | | | | | | | This reverts commit 504ba059df18c524fa8199084791f3b792b2104e. The test was failing due to a regression in qtscript that's now been fixed (commit 9429a85a2160cf8b860b1292e4e0bc0855841755). Task-number: QTBUG-26889 Change-Id: If7a417d4d3f67a853ffde1033ab2ae9e43f44a2c Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Use Qt::WindowFlags, not Qt::WFlags.Stephen Kelly2012-08-201-1/+1
| | | | | | | | | The latter seems to date from the Qt 1 days, and such abbreviations are not current Qt style. Change-Id: I6384d32f125fe7800c57e387f48930a1e71fbe08 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Skip failing test for now.Lars Knoll2012-08-201-0/+2
| | | | | | | | | Created QTBUG-26889 describing the failure. We need to skip the test for now to unblock qt5.git integration. Change-Id: I2be7ebcbd655a7a32a4c7e49d7a2e4889ee9c164 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove the user of the QWidgetStar metatypeid.Stephen Kelly2012-08-153-6/+0
| | | | | | | | It is to be removed, and is obsoleted by QMetaType::PointerToQObject. Change-Id: I6832808cfd1e22d6c04c7ba37bf52ff7c36f0272 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Use qtxmlpatterns only if it is availableYuchen Deng2012-08-141-1/+1
| | | | | Change-Id: I6a84f8b35f26fbe44b51ecf4f38aa2619996e83a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* make use of QT_PRIVATE to specify private Qt dependenciesOswald Buddenhagen2012-08-141-3/+1
| | | | | Change-Id: Ia65d09d850a58e66db2d6d2a25703725283dbdb8 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-141-1/+1
| | | | | Change-Id: I1d1be313492c311aaaf6a87dd96d56d08feb097e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Update autotest to match new QScriptEngine::pushContext behaviorKent Hansen2012-08-141-3/+5
| | | | | | | See commit 68458376c0db2f786b2c9ab3b8dfd21695a5645e in qtscript. Change-Id: If62bf96d9a965ba500c7a4786d347c828a1683b1 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Remove insignification from qdeclarativeimage test.Jason McDonald2012-08-072-2/+4
| | | | | | | | | | Prior to this change, the test had one stable XPASS on all CI platforms except Ubuntu 10.04. Limit the QEXPECT_FAIL to that one platform and make the test significant again. Task-number: QTBUG-26787 Change-Id: Id6c9dfc9a8d6de149dbb739c3e8c6311ce903c39 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix warning in qdeclarativeimage autotest.Jason McDonald2012-08-071-0/+4
| | | | | | | | The test warned about an unregistered metatype, though this didn't cause the test to fail. Change-Id: I7338d3e2e4f81c7ab5351c4b7e7b69a60870d49f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove insignification from qdeclarativeviewer autotest.Jason McDonald2012-08-071-1/+0
| | | | | | | | This test was failing consistently until recently. Make it significant to prevent further regressions. Change-Id: I90ad6215d034d219a938973a7430c58c3604e838 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove insignificant_test from qdeclarativexmlhttprequest.Andrew den Exter2012-08-061-1/+0
| | | | | | | | A fix for the failures has been merged. Task-number: QTBUG-26703 Change-Id: I23b2e8d8f4211b076a0c4666e77fd94a9b2a6580 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix tst_qdeclarativexmlhttprequest failure on Windows.Andrew den Exter2012-08-061-0/+3
| | | | | | | | | Disable line ending conversion for test data files so that they are served as lf on all platforms. Task-number: QTBUG-26703 Change-Id: I1a48232f631a722342da6a8d50dcbe341ba5689c Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix compilation of missed network dependYuchen Deng2012-08-031-1/+1
| | | | | | | | qtquick1/src/declarative/qml/qdeclarativeengine.cpp:78:25: fatal error: QNetworkReply: No such file or directory Change-Id: If39be538bd135118d6654e154e86e8a082f03a58 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Set the Qt API level to compatibility mode in all tests.Thiago Macieira2012-08-0392-0/+95
| | | | | | | | | | Qt 5.0 beta requires changing the default to the 5.0 API, disabling the deprecated code. However, tests should test (and often do) the compatibility API too, so turn it back on. Task-number: QTBUG-25053 Change-Id: I9b0267e5fd947cec4b66debfa6c2795008643d18 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove obsolete scene argumentLars Knoll2012-08-030-0/+0
| | | | | | | | The scene argument in the graphics item constructors has been deprecated since 2007 now. Change-Id: Ib5f3fab230775bc18fec4ed1738e1542c423064c Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix install paths of demos and examples.Andrew den Exter2012-08-03521-628/+131
| | | | | | | | | | | | | | | Install all demos and examples to the qtquick1 subdirectory of the examples install location, demos under a demos folder, declarative examples under a declarative folder and the common viewer code under a helper folder. This mirrors the directory structure of the src directory and ensures the examples sources can be built from the install location. Task-number: QTBUG-26663 Change-Id: I406f4fa58e5f004eb1aef5902fa2d6267517943d Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Do not assume ordering of resources declared for the default propertyMatthew Vogt2012-08-033-2/+26
| | | | | | | | | The order in which resources declared in QML are placed into the default property is not defined, and should not be relied upon. Task-number: QTBUG-26702 Change-Id: I5023b8dad89513cde69852e0c3a910477f60888e Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Compile fix for QWindowSystemInterface and QGraphicsObjectMatthew Vogt2012-08-035-4/+6
| | | | | | | | | Adapt to changes in qtbase - removal of third parameter to the QGraphicsObject ctor, and the declaration of the QWindowSystemInterface class. Change-Id: I8b01ae67f09cbf4fc2e3e062dc8b976ccb061234 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix instability in QDeclarativeListModel test.Andrew den Exter2012-08-022-10/+14
| | | | | | | | | | Role names in QDeclarativeListModel are stored in a QHash which doesn't have a stable sort order so the test cannot rely on the properties being returned in a specific order. Task-number: QTBUG-26706 Change-Id: I0f10e75f7940d70f31fa399f91022fe025ef1195 Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Fix install path of folderlistmodel particles and shader import pluginsAndrew den Exter2012-08-013-5/+0
| | | | | | | | | | | | | | 19bba2faca1e1a1e6ddbb7a899a6894fc64c1723 added QtQuick1 to both the base path of QtQuick 1 imports and the target paths of individual plugins leading to a duplication of QtQuick1 in the final path. Remove the suffix from the root destination directory as the plugins still need to explicity include it in the install path and it's better if there's a single relative target path used in the .pro files. Task-number: QTBUG-26707 QTBUG-26701 Change-Id: I79ee28fc5b6ef549cf3c5f71585756149f0f8ff3 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Refer to specific bug report for qdeclarativeparticles testJason McDonald2012-08-011-1/+1
| | | | | | Task-number: QTBUG-26707 Change-Id: I07b1a9818a2d5050e02f259e2e9d240fe2c4b251 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Refer to specific bug report for qdeclarativelistmodel testJason McDonald2012-08-011-1/+1
| | | | | | Task-number: QTBUG-26706 Change-Id: Icda045e25426f681fe95a899935ae02f58cac239 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Refer to specific bug report for qmlvisual testJason McDonald2012-08-011-1/+1
| | | | | | Task-number: QTBUG-26705 Change-Id: I1ce74771b9e4ed3adb90a0c0d83877523c955567 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove insignification from qmlshadersplugin autotest.Jason McDonald2012-08-011-2/+0
| | | | | | | This test has been stable since CI started using Mesa drivers. Change-Id: I0afda507edc042c0dd55c0d35ac16caa2ce2bf43 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Re-enable qdeclarativexmlhttprequest test on Mac and Linux.Jason McDonald2012-08-011-1/+1
| | | | | | | | | The test only fails on Windows, so remove insignification on other platforms. Task-number: QTBUG-26703 Change-Id: Ibff49ae81b6792ca1db473700cd03e98729faa0d Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Refer to specific bug report for qdeclarativedebug test.Jason McDonald2012-08-011-1/+1
| | | | | | Task-number: QTBUG-26702 Change-Id: Ibe3aee53c8c5eca9e05e640e84e0b0205d56a7d6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Refer to specific bug report for qdeclarativefolderlistmodel test.Jason McDonald2012-08-011-1/+1
| | | | | | Task-number: QTBUG-26701 Change-Id: I094a61368e789835b40a33c7c397fedc7ee2f031 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove phonon as per removal in qt5.Toby Tomkins2012-08-011-1/+0
| | | | | | | | 5fb5e0dfc7d794df882408d4c7b6c0e14073282b removes qtphonon from qt5 compilation, also remove it in this repository. Change-Id: Iab05e978cc85a6191618faab745ef3a5744d089f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QDeclarativeView-plugin: Fix include of the QDeclarativeView widget.Friedemann Kleint2012-07-301-1/+1
| | | | | | | | Task-number: QTBUG-25196 Change-Id: Ibdd3053768972a98374cf22c5749448008f303ae Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiatesJerome Pasion2012-07-3050-94/+188
| | | | | | | | -\qmlclass is now \qmltype -\instantiates is for QML types implemented in C++ Change-Id: I017822524de1879d272d777ec7681f4233128b01 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* MouseArea: use current value of drag.axisAlberto Mardegan2012-07-274-11/+109
| | | | | | | | | | | | | If the drag.axis is changed while a drag operation is in progress, put it into action immediately. This allows, for example, start a dragging operation out of an item in a scrollable ListView to anywhere on the screen. See the linked bug number for an example. Task-number: QTBUG-26440 Change-Id: I4ffa71c08b97a767aec7f69d19271000a2631327 Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Remove obsolete use of Q_WS_QWS.Stephen Kelly2012-07-273-7/+7
| | | | | Change-Id: I0c2af5663852a1fa456684424c220697fa6824e8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 21:52:11 +0000