summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* MouseArea: use current value of drag.axisAlberto Mardegan2012-07-272-11/+8
| | | | | | | | | | | | | 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-271-1/+1
| | | | | Change-Id: I0c2af5663852a1fa456684424c220697fa6824e8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* remove double-string-double conversion from QDeclarativeListModelFlorian Hänel2012-07-241-4/+7
| | | | | | | | | we do a double-string-double conversion in QDeclarativeListModel which introduces precision errors if that conversion is lossy, e.g. ecvt. is used Change-Id: Ie871ebbb04695f56fc7b49b9d788037da4a857c0 Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Fix objectName test in tst_qdeclarativeecmascript.Glenn Watson2012-07-134-24/+2
| | | | | | | | | | | The QtQuick1 library relied on special case handling of the objectName property in qtbase. With Qt5, there is a normal notify signal for objectNameChanged. Remove the QtQuick1 special cases and fall through to the default code path. Task-number: QTBUG-26334 Change-Id: I70f31947b6c74c7125d6f99a33e9b02d7ef52273 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Use the new QT_STATIC macro from qglobal.hThiago Macieira2012-07-111-15/+5
| | | | | | | This simplifies the handling of static vs shared/DLL builds. Change-Id: I547df9bc1da3dd0dca4c621f46450328e47cab3c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* load plugins properly when QT_NO_SETTINGS is definedTasuku Suzuki2012-07-061-3/+0
| | | | | Change-Id: I9bc7a3ed70f866c59ba9f72ad3a96b22e6bbf7a6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Qml ListView highlight component cannot access ListView scopeMartin Jones2012-07-042-64/+48
| | | | | | | | | Use the component creationContext to create the highlight item. Also do this for the header and footer. Task-number: QTBUG-26043 Change-Id: I74276dfbcb4989b8e2b5acf1f2b16ed5537e24de Reviewed-by: Bea Lam <bea.lam@nokia.com>
* anchors.mirrored is documented but does not exist in QtQuick 1Martin Jones2012-06-291-4/+0
| | | | | | | | | anchors.mirrors was removed before QtQuick 1.1 release, but the docs were not removed. Task-number: QTBUG-23427 Change-Id: I8352a444b97a21a98228b85f12a652ed013e93f1 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Install the qmlgesturesplugin in the correct locationmarc_philippens2012-06-281-1/+1
| | | | | Change-Id: I8438bcc8166c1e34bd04b399a02f95d11b1c4d22 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Rename qmldbg_tcp plugin to avoid conflict with qtdeclarative's copyKent Hansen2012-06-286-5/+3
| | | | | | | | | | ... and compile the plugin regardless of whether qtdeclarative has been qmake'd. Change-Id: I704214e07a92eff6630d94858eb6898a399d6fa2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Item.mapFromItem() crashes with Items not created by the engine.Martin Jones2012-06-271-2/+4
| | | | | | | | | | Item.mapFromItem() and Item.mapToItem() get the script engine from the item they are called on. Safer to use the script value passed to the function to determine the engine being used. Task-number: QTBUG-26280 Change-Id: Id72afd723b21ed0f1a747e2d802d6f9715f6c093 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-261-7/+2
| | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - setup of PKGCONFIG* variables (automated now) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments Change-Id: I4b3a1cd560e99658102d374fb278fe3e7744bae9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-261-3/+5
| | | | | Change-Id: Ia96fa9e0ba43de4c32053699d0e9528ef308fb67 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove QtSvg library use.Toby Tomkins2012-06-261-1/+0
| | | | | | | | | Changes in the build system causes the header of this library to be included incorrectly. This library was never a hard dependancy for qtquick1. Change-Id: If28d4fcd7879c04772158f1e03da6e05c6f21928 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Import QtQuick1 WebView from upstream WebKit trunkSimon Hausmann2012-06-256-0/+1606
| | | | | | | | | | | Move QtQuick1 WebView from WebKit trunk into this module. It only depends on public API and is otherwise self-contained. The files upstream are all copyright Nokia, hence the import here with according re-licensing. The plugin is not enabled by default yet. Change-Id: I3fce42d90e83edfaec59ff263e31bfe314f4377c Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QDeclarativeVisualDataModel crashes getting QAbstractItemModel roles.Martin Jones2012-06-221-2/+3
| | | | | | | | Don't iterate over a temporary. Task-number: QTBUG-26209 Change-Id: Iab99d0756c5c30e4f5bb9b674a20eaf76ebce1e6 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Include <QDataStream> properly where QDataStream is usedThiago Macieira2012-06-194-0/+4
| | | | | | | | | | | And add the missing forward-declaration to QMetaObject in one place. I guess no one noticed that QObject was actually fully-declared, despite the existing forward declaration. This was caused by qpair.h including qdatastream.h, which includes qiodevice.h, then qobject.h, then qobjectdefs.h. Change-Id: Idd3aef1acecf0c045a63c154c3ce2d7835afa71b Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Finish the conversion from QWeakPointer back to QPointerThiago Macieira2012-06-198-18/+18
| | | | | | | | | Use QPointer to store classes derived from QObject that weren't initially shared with QSharedPointer. QWeakPointer must be used only with QSharedPointer. Change-Id: I28705055bb0167300fee2dee45a8f05cc8f818f3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Wrong signals received when moving Flickable elementKatja2012-06-161-2/+2
| | | | | | | | | | Both onMovingHorizontallyChanged and onMovingVerticallyChanged received when Flickable element moved only to one direction. Fixed so that only relevant signal sent. Task-Id: QTBUG-25042 Change-Id: I20acb2403e08c2afa681da2e553cea227c91f001 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* QtQuick1: Fix warnings about QWeakPointer usage.Friedemann Kleint2012-06-134-11/+12
| | | | | | | | - Use getPointer to get a weak pointer for the binding. - Change QWeakPointer<QObject> to a QPointer. Change-Id: I6c362a51c398f73817b5f4545d21f4845d625e13 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Separate the path for Qt Quick 1 plugins from Qt Quick 2Lars Knoll2012-06-125-5/+5
| | | | | | | | | | | | Install and load Qt Quick 1 plugins from imports/QtQuick1/... This is to avoid conflicts between Qt Quick 1 and 2 and cleanly spearate the plugins for both. Currently, e.g. the folderlistmodel exists for both, and gets installed into the same location. Change-Id: I55331a5a02148eacc3c615436d77eb97bf0fbd72 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Move the designer plugin from qttools hereLars Knoll2012-06-075-1/+225
| | | | | | | | | Like this the plugin is together with the functionality and thus automatically gets installed when the module gets installed. Change-Id: I01f9f61d46fb5ef11c5c8f474df8df59865e535c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QDeclarativeXmlHttpRequest - use readyread signal not downloadProgressShane Kearns2012-06-061-5/+4
| | | | | | | | | | | | | The readyRead signal (part of QIODevice base class) is the appropriate signal for knowing when there is data available in a QNetworkReply. DownloadProgress is intended for UI elements e.g. progress bars. Previously it was emitted at the same time, but now it is emitted less often. Task-number: QTBUG-20449 Change-Id: I732a2facb083f4cc35d01441a34964847f00fdb2 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Remove the remaining traces of the old plugin systemLars Knoll2012-06-051-2/+2
| | | | | Change-Id: I0b4156f01d5d1bfe5cdde724148ed681025ab227 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Propagate left key presses to the parent item when TextInput is empty.Marcel Schuette2012-05-311-1/+1
| | | | | | | | | Don't overwrite the ignore value once it's been set to true. Backport from QtQUick2 to QtQuick1 in Qt 5 (commit a7017465152d544a4217d5ce4f6f84b80cb9b8b9) Change-Id: Ia93e234773bb75040f889cc03853be311dbafd70 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fix compilation for QT_NO_ACTION, QT_NO_CONTEXTMENU and QT_NO_MENUTasuku Suzuki2012-05-295-2/+21
| | | | | Change-Id: I8684a7045100e7020648e54779286ff0d6683ade Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix memory leak in qdeclarativevisualdatamodel.Andrew den Exter2012-05-281-2/+4
| | | | | | | | | | | | | | Cherry-pick of b26a588c1702a84ba853df3c757d879cc9f2fc46 from 4.8 Parent order was backwards, the inner context was parented to the outer context, and then the inner context was reparented to the delegate. Parent the outer context to inner context so both are deleted when the delegate is deleted. Task-number: QTBUG-25784 Change-Id: I4a500b41b02d3cb5dfead4b87ac86e9583024108 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Quick1/QDeclarativeFontLoader: Output warning on failure.Friedemann Kleint2012-05-221-0/+2
| | | | | | | | | Helps in case the 'file::' prefix is missing from local file URLs on Windows. 'C:\foo' is then interpreted as URL with protocol 'c', causing an error. Change-Id: Ib6f4b096bbd1daf0fbc2d58aef714d131e52ef92 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Move QIcon reference from QtWidgets to QtGui.ybot2012-05-201-1/+1
| | | | | Change-Id: I975527171f840d5ea6cdd3c99c35379b5d9faa36 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Eliminated usage of "declarative" compat module.Rohan McGovern2012-05-151-1/+1
| | | | | | | | | | | | | | | | The check in qmltooling attempts to avoid installing the qtquick1 version of the debugger plugin if qtquick2 is used. The removal of the declarative module meant that this plugin was always enabled, potentially overwriting the qtquick2 debugger plugin. This check was updated to work again, although this approach is still somewhat problematic. It would be better if the different versions of the plugins had different names. The check in tools/designer/src/plugins doesn't seem to make sense, so it was removed. Change-Id: I55d1bf59264d3c5d62c2d4545e9ced952e460efb Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Doc: Fix \sa usageMarius Storm-Olsen2012-05-103-9/+9
| | | | | | | | Ensure comma between elements (9 missing), single space and curly- braces around title elements, etc. Change-Id: Iefe491665804861f2a179ca87fb2f8a0eded8781 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QtQuick1: Fix build warnings.Friedemann Kleint2012-05-102-1/+2
| | | | | | | | - Add missing .json file. - Fix warnings about unused variables, deprecated cast from char*. Change-Id: Ibb5065e604460ff945b3e452b2270d2b7368ea49 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove hook for objectNameChanged signal handler.Andrew den Exter2012-05-102-13/+0
| | | | | | | | Made obsolete in Qt5 with the addition of an objectNameChanged signal to QObject. Change-Id: I86df09ade866f0322303f40de223cb84b8e95c27 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QAbstractItemModel::setRoleNames is not necessary.Thiago Macieira2012-05-073-7/+11
| | | | | | | We have a proper virtual in Qt 5 now, so use it. Change-Id: Ieff72a7cb6feb17282f600d8d21e3f4fbe1914a4 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* QApplication::keyboardInputDirection is deprecated.Thiago Macieira2012-05-041-1/+2
| | | | | | | Get the direction from the input method. Change-Id: I81c567e0db4787b6f38a4b0446959b85f441625d Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Change uses of {to,from}Ascii to {to,from}Latin1Thiago Macieira2012-05-041-2/+2
| | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: I657ca349b700fa043a796b7a464d057ca18bb90a Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* QtQuick1: Fix deprecation warnings.Friedemann Kleint2012-05-027-21/+33
| | | | | | | Introduced by qtbase:0df1c9f1fa04c06d6105de3f312c6c752a58ad70 Change-Id: I61e330707a49efd09bad0efda386712fba207c8a Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix warnings in autotests.Jędrzej Nowacki2012-04-241-0/+4
| | | | | | | In Qt 5 QVariant can not be constructed for "void" type. Change-Id: Ic58ec9a17c93ec0f3e587da8b820e289699f67d7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Don't use the deprecated value 0x100 for QUrlThiago Macieira2012-04-201-2/+2
| | | | | | | QUrl::toString is enough Change-Id: I02ff012dd3f36681e2040181e6775df4ca0c1003 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Small optimization in declarative property cache.Jędrzej Nowacki2012-04-181-5/+1
| | | | | | | | We do not need to do a name lookup, with new api we can get a type id directly from QMetaMethod. Change-Id: I180a0e409c3d4a8c49f228db5417d4f1d9f0cf00 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Adapt to Qt5 meta-object changesKent Hansen2012-04-188-19/+22
| | | | | | | | | | | | | | | | | | | | QMetaMethod::signature() has been renamed to methodSignature(), and returns a QByteArray, not const char *. Thew new function QMetaMethod::isValid() should be used to check whether a method is valid (it's a lot cheaper than calling signature()). Also use the new QMetaObject::checkConnectArgs() overload that takes QMetaMethods, not strings, as arguments. Further improvements can be made by using the new functions QMetaMethod::name(), parameterCount() and parameterTypes(), but that will be done in separate commits. Change-Id: I3e4cfbdc7799d8bce747ef37f07d0d097370e409 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix compilation and tests after qtbase/api_changes mergeKent Hansen2012-04-183-10/+4
| | | | | | | | Adapt to QUrl changes, based on how qtdeclarative was adapted in commit 2d393ae042d5badf0862c0f95122f9662042f2a9. Change-Id: I9d1fddf4bbc6d86ac206dca4ac929d180ec12efa Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* QInputPanel has been renamed to QInputMethodGirish Ramakrishnan2012-04-141-3/+3
| | | | | | | QGuiApplication::inputPanel will be removed. Change-Id: I8c9a994777301c30f234e0b23816c12ec27c7a0f Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
* TextInput not to use obsolete realText() in QWidgetLineControlPekka Vuorela2012-03-231-1/+1
| | | | | | | As of tentative commit reverting, the method is not available anymore. Change-Id: Iab8f8a860556f2d81bd89567ab7f0225fa03e972 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* TextInput not to emit selection change signals if values do not changePekka Vuorela2012-03-231-8/+7
| | | | | | | | | Fixed also tests with QTBUG-24036 Test was assuming selectionStartChanged and selectionEndChanged to trigger even if their values did not change. Change-Id: I26e57cfb4ff06ec6c195ec2b0d997885c807670b Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Build with g++ / C++11.Friedemann Kleint2012-03-201-1/+4
| | | | | Change-Id: Ibc538d11806d0fec452ee9eb01936940da9dc199 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix QDeclarativeItem::hasActiveFocus().Andreas Aardal Hanssen2012-03-131-2/+5
| | | | | | | | | | | | | | | | | This function returns true if the item (or, in case it's a focus scope, one of its children,) has focus (i.e., will receive key events now), or will receive focus once the scene is activated. It also returns true if the item has not yet been added to a scene, but has subFocus, implicating that someone has called setFocus() on it prior to it being added to the scene; the latter case seen most commonly in unit tests. Task-number: QTBUG-24681 Change-Id: Ia1265158108d5d856b57e34a8efee2545cd0deeb Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Remove the usage of deprecated qdoc macros.Casper van Donderen2012-03-1340-651/+651
| | | | | | | | | | QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: Iae34eb8f2233dd9dbec79e7ab3c324f3f505b4cc Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Define Q_QUICK1_EXPORT independentlyMatthew Vogt2012-02-2766-162/+303
| | | | | | | | | | | | Define Q_QUICK1_EXPORT and Q_QUICK1_PRIVATE_EXPORT inside the qtquick1 module rather than using the definition in qtbase. This change undefines the definitions from qglobal.h; the undef should be removed once the definitions have been expunged from qtbase itself. Change-Id: I1ee6fa1e513d110d9a298d897a8d3d465290e9ce Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix build issues related to QT_NO_*MODULE* defines.Andrew den Exter2012-02-222-4/+4
| | | | | | | | | | The QT_NO_XMLPATTERNS and QT_NO_CONCURRENT defines don't exist in Qt5 check for the existance of the modules with QT_XMLPATTERNS_LIB and QT_CONCURRENT_LIB instead of their absence with the old defines. Change-Id: I52bc9932294fe4564e58d06766301e2a0c41f15c Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
View Lorry Controller Status