summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* Use new plugin system in QtQuick1.Friedemann Kleint2012-02-2127-25/+51
| | | | | | | | - Use prefix "org.qt-project" for interfaces. - Use new macros, add json files. Change-Id: I157206ad883be16fb85b9b6bffca7200532561e4 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Adapt to QInputPanel -> QInputMethod renamingPekka Vuorela2012-02-152-7/+7
| | | | | Change-Id: Id11fc9ae1be91611fee22d28407e54035e190c71 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Install import qmldir files to correct locationMatthew Vogt2012-02-091-1/+1
| | | | | Change-Id: I7d8999897f367726d2b254d5f1c127cc3fd65fc4 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* QtQuick1: Fix warnings of gcc 4.6Friedemann Kleint2012-02-082-4/+3
| | | | | | | | - Fix warnings. - Remove duplicate entries from profile. Change-Id: I7b4a3cd71ec7d1c11b3530c95f57fef3a3041b16 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Don't include pri file from qtbase source directory.Andrew den Exter2012-02-071-2/+3
| | | | | | | The pri file is one line, just duplicate it. Change-Id: Ie541efb5713fa69763ca75a66f97ebaa69cb5a84 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix license header format.Matthew Vogt2012-02-07385-772/+386
| | | | | Change-Id: Ib71237ed181d075329a0267b5c108e6534c13e4e Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Install QtQuick1 imports to the correct locationSean Harmer2012-02-071-1/+1
| | | | | | Change-Id: I61597e008f34424ff3fc4254ca5e2e00bd638260 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* QtQuick1: Fix compilation on Windows.Friedemann Kleint2012-02-079-7/+8
| | | | | | | | - Add missing modules, includes. - Fix warnings. Change-Id: I21a6107db6c5978ccfd59c4202cf31e3deba19ca Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix compile failures due to the removal of QInputContext.Andrew den Exter2012-02-071-1/+0
| | | | | | | The class was unused but still included by a couple of files. Change-Id: I8172be02d6185b44cf37d28220b99a1a206c95a0 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix license headers to match conventions.Matthew Vogt2012-02-07385-323/+710
| | | | | | | | Files updated to mtach licensing conventions for different types, and license text updated to match current. Change-Id: Ib2c7457fbc3b37907ab3936e176e6f16f8308036 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix qdeclarativedebug* test failures.Andrew den Exter2012-02-034-0/+302
| | | | | | | | | Add a copy of the qmldbg_tcp plugin to be built when the qtdeclarative module is not available, and fix a failure due to metatype enum reordering. Change-Id: I0c0a40bffba327d3342b5def4f6de331ad65e177 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Install binaries and imports to qtbase.Andrew den Exter2012-02-035-7/+6
| | | | | | | Use the Qt.quick1.* variables to determine the DESTDIR. Change-Id: I17b6d1f037b76ed25a005ec56cbc5c82b522ffc6 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix crash in QDeclarativePathView test.Andrew den Exter2012-02-022-0/+2
| | | | | | | | | | | Ensure items that are scheduled to be deleted later are also parented to either their view or visualdatamodel, so the items are destroyed when the scene or engine if that happens before a DeferredDelete event can be processed. Change-Id: Id336f298067efee86dd32837f595c55b79bc5450 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add qmlplugindump tool to qtquick1 moduleMatthew Vogt2012-02-021-2/+2
| | | | | Change-Id: I94a52b2207fb2b5dd66e9e4da8f42ddf2daf4da0 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix qdeclarativeecmascript test failure.Andrew den Exter2012-02-021-3/+5
| | | | | | | | Don't use hardcoded constants for the number of methods belonging to QObject as they can and have changed. Change-Id: Iaae3bb6cad34fce6c2351217480755f1ac2f6085 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix breakage due to meta-type id reordering in qtbaseAndrew den Exter2012-02-011-1/+7
| | | | | | | | Cherry-pick of 40c8da550cac90460970f1dbdca1e6f02be99a8c in qtdeclarative. Change-Id: I85d0922dc1ddbdfc24c100d8bbf4d085513a5739 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix compile failure due to API change in QRegion.Andrew den Exter2012-02-011-1/+1
| | | | | Change-Id: I94929e93970a980285d4a05d856be669b2a3c28f Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Fix assert when binding to property variant.Andrew den Exter2012-02-017-3030/+92
| | | | | | | | | Remove workarounds for the QVariant meta-type and use it directly and remove QMetaObjectBuilder entirely and use the up to date copy in qtbase. Change-Id: I1ad601906d6b172adc7ce7bb63af28cd578eb5d7 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix compile failures.Andrew den Exter2012-01-317-102/+95
| | | | | | | | Remove uses of QLineControl, QTextControl and QBool and forward declared QGraphicsWidget. Change-Id: Ic5184a1d5aebfb1100ad0e24444b6773f4e617e8 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 15:38:03 +0000