summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* disable module when widgets is not availablev5.0.2Tasuku Suzuki2013-03-221-0/+2
| | | | | | Change-Id: I3849f3dfb1d33bf15053fae864393d5755a2ea8d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add changes-5.0.2 fileSergio Ahumada2013-03-201-0/+22
| | | | | Change-Id: I75fe0526bb3698cbbe6555cbb13eb32fd1bfa3c6 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | Task-number: QTBUG-29838 Change-Id: I0dd628cdf63c13a8ac94213f2fc1b7d04df24786 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge branch 'stable' into releaseJohanna Aijala2013-02-211441-20104/+20752
|\ | | | | | | Change-Id: Ib992a6e988e06887f7a4b3bc581514aa6a5b8886
| * Copy builtins.qmltypes into the 'imports' directoryKai Koehne2013-02-201-2/+2
| | | | | | | | | | | | | | | | | | | | We used to copy builtins.qmltypes into qtbase/imports/QtQuick1, but install it into into $QT_INSTALL_IMPORTS. Unify this by copying it also directly into the imports directory. Change-Id: I9fe2feae4ff0da49d59d787b92ba2d7d4c47461d Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Add license files mandated by (L)GPL.Timo Jyrinki2013-02-194-0/+1660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently only qtbase includes the required LICENSE files, which are referred to from the code headers. The same files should be distributed as part of all the modules as well, so that the (L)GPL licenses are adhered. These files were wget:d from: https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL As an addition to above, added also LICENSE.FDL. All the modules additionally require it, since they include at least *.qdoc files and in some cases a couple of others. File received via wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL Change-Id: If6ef4884fe1061767fa9d66462758d20389e9d3d Reviewed-by: Jason McDonald <macadder1@gmail.com>
| * Doc: Removed reference to deprecated \badcode command.Jerome Pasion2013-02-155-12/+14
| | | | | | | | | | | | | | | | | | QDoc doesn't differentiate between \badcode and \code. They both look the same in the output. Change-Id: I3661a893a9413a0b137e236083cc9ac5677ffecb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Remove QPointerBase bic check.Stephen Kelly2013-02-131-5/+0
| | | | | | | | | | | | | | QPointerBase is not public or exported and it is to be removed Change-Id: I0c99526c56d4df0276965427d1cd5d89b574ecb7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-6/+6
| | | | | | | | | | Change-Id: Ic87c7fdecbe3c5431d38b228e186237ccd2aed3b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Merge branch 'release' into stableSergio Ahumada2013-01-312-2/+2
| |\ | |/ |/| | | Change-Id: Ied6e28f0e7e3dceccdbbe878dfab8f88c64e32d8
* | doc: Fix namespace version to 5.0.1 for qhp documentationv5.0.1Sergio Ahumada2013-01-121-1/+1
| | | | | | | | | | Change-Id: I995109869294f3106046a8fd8299b6300b4c567f Reviewed-by: hjk <qthjk@ovi.com>
* | test examples only in developer buildsOswald Buddenhagen2013-01-111-1/+1
| | | | | | | | | | | | | | | | | | we don't want to actually build examples in production builds any more, so the test is bound to fail. Change-Id: I5c936a5b193aa575a0193dcf0968cce9c20c505f Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge branch 'stable' into releaseSergio Ahumada2013-01-0928-93/+195
|\ \ | | | | | | | | | Change-Id: I1f4521205b6bb3811294fd2c32df4b4bce97d147
* | | point dependencies to 'release' branchesSergio Ahumada2012-12-181-8/+8
| | | | | | | | | | | | | | | | | | Change-Id: Id025dd987dc759941cc4022ee6814e8f599b562c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * remove pointless conditionalsOswald Buddenhagen2013-01-3071-142/+71
| | | | | | | | | | | | | | | | | | | | | | | | it's not entirely clear why anything inside the declarative module would have a conditional on the presence of the declarative module ... Change-Id: Ie6e22840b6d1d63da90c7d02aedb14fd870191af Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * make use of qtHaveModule()Oswald Buddenhagen2013-01-2810-16/+16
| | | | | | | | | | | | | | | | | | Change-Id: I6482af592a564dbbbab28b3f425ab2886f6d1bea Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * tst_bic: Add linux-gcc-ia32 bic dataSergio Ahumada2013-01-152-0/+17622
| | | | | | | | | | | | | | | | | | | | | | | | | | | Adding bic data for the following module: - QtDeclarative Change-Id: I9a6ab1e7b1f6bc5899fd2b0ba09bafd88c49744e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Remove the Qt 4 BIC data for qtquick1Sergio Ahumada2013-01-151-18158/+0
| | | | | | | | | | | | | | | | | | | | | We will not be testing BIC of Qt5 against Qt4 Change-Id: I4a19ca74b1f537e8ce2e0bd77120097967eb27c9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Doc: Remove duplicate consecutive wordsTopi Reinio2013-01-114-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Grepping through qdoc files, 'the the' appears in a few places. Also one instance of 'centre' replaced by 'center'. Change-Id: If978895c470ff02a0fe0c164aec421943deb24d3 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| | * Update copyright year in Digia's license headersSergio Ahumada2013-01-101347-1349/+1349
| | | | | | | | | | | | | | | | | | Change-Id: I0281c3f6c10bb7c57f0e470306f38e96badf997b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| | * Remove QPerformanceTimer now that QElapsedTimer contains the necessary bitsRobin Burchell2013-01-098-415/+13
| |/ | | | | | | | | | | | | | | | | | | | | QPerformanceTimer was a copy of QElapsedTimer with some additional functionality which has since been subsumed into QElapsedTimer, so remove the forked code. (backport of cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e from qtdeclarative) Change-Id: Ife1dac4d6c46404b43253680819da21350c65569 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Fix image source for networkaccessmanagerfactory exampleTopi Reinio2013-01-071-1/+1
| | | | | | | | | | | | | | | | | | Change the image URL to point to an existing image. Task-number: QTBUG-28374 Change-Id: Ied1ea7911757b1098847cb074b71650f9cc44776 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| * Improve tst_qdeclarativetextedit.Friedemann Kleint2013-01-072-60/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Base on QDeclarativeDataTest to locate test data. - Make small windows frameless to prevent errors from minimum size constraints of decorated windows on Windows. - Add test messages printing the value of comparisons. - Skip alignment tests if no reference image exists: Previously, the test would create an image file name "<testfile>-unknown-architecture", find out it does not exist, write out the 'actual' image under that name (clobbering the source directory) and compare to it, claiming success. The reference image name is now composed of platform and style name and the test is skipped if the file does not exist. Task-number: QTBUG-28611 Change-Id: If1496e11db9638e7febd3af637ad55d7c6f11409 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
| * Fix mistake in using == instead of =Thiago Macieira2013-01-041-1/+1
| | | | | | | | | | | | | | | | | | Found by clang: qml/qdeclarativexmlhttprequest.cpp:1324:24: error: equality comparison result unused [-Werror,-Wunused-comparison] Change-Id: Ie46678d6102f2e50bf87a53a9cbc14d114b4e334 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Fix some warnings in qtquick1 found by ClangThiago Macieira2013-01-045-7/+7
| | | | | | | | | | | | | | | | | | | | | | qml/qdeclarativevme.cpp:286:26: error: destination for this 'memset' call is a pointer to dynamic class 'QObject'; vtable pointer will be overwritten [-Werror,-Wdynamic-class-memaccess] qml/qdeclarativemetatype.cpp:441:9: error: expression result unused; should this cast be to 'void'? [-Werror,-Wunused-value] util/qdeclarativefontloader.cpp:87:52: error: addition of default argument on redeclaration makes this constructor a default constructor [-Werror,-Wdefault-arg-special-member] qmlplugindump/main.cpp:180:75: error: unused parameter 'engine' [-Werror,-Wunused-parameter] qml/qdeclarativefastproperties_p.h:53:1: error: class 'QMetaObject' was previously declared as a struct [-Werror,-Wmismatched-tags] Change-Id: I1e91252d048e36e684a854ca1c6eb92e5a871444 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Silence the Clang warning about overloaded virtual shadowing a previousThiago Macieira2013-01-041-0/+11
| | | | | | | | | | | | | | | | | | There are a couple virtuals that are being overridden intentionally. We can't raise the previous virtual because they are privates. So the only thing we can do is disable the warning. Change-Id: Ie9c02e5d5a02d35c4cd7712c554be6e5cf5523a7 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Add changes-5.0.1 fileSergio Ahumada2012-12-241-0/+51
| | | | | | | | | | | | Task-number: QTBUG-26065 Change-Id: Idbc97cdcb3f7d4117e82ad8c7f0c552a617a930b Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Bump Qt version to 5.0.1Sergio Ahumada2012-12-231-4/+4
| | | | | | | | | | Change-Id: I925fc622998c0ea7e8b045b70e0145a9bbd29459 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Add qmake generated files to .gitignore.Miikka Heikkinen2012-12-201-0/+3
| | | | | | | | | | | | | | | | Add source files generated by qmake for automatic static plugin imports to .gitignore. Change-Id: I9b80e83beb65041f7c6f79c0b2ad8c04f05343eb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * QmlViewer: Fix test script exits.Friedemann Kleint2012-12-201-5/+19
| | | | | | | | | | | | | | | | | | | | | | Use exit code 1 on Windows to indicate failures as negative exit codes are reported as crashes by QProcess in the qmlvisual test. Always use QCoreApplication::exit() to ensure proper cleanup. Task-number: QTBUG-28611 Task-number: QTBUG-28735 Change-Id: I0b12153449f7371ce7795a5747e3311184bc7b6f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * QmlViewer: Display options on Windows using a non-proportional font.Friedemann Kleint2012-12-201-1/+3
| | | | | | | | | | Change-Id: I7006fdc73c459da0e19e08fbda35905f32f2aebc Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * remove pointless harfbuzz includeOswald Buddenhagen2012-12-191-1/+0
| | | | | | | | | | Change-Id: Ie2aa164eeb265a52a59da080f51e29aeaf77083b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-199-9/+9
| | | | | | | | | | | | | | qt is already added by spec_pre.prf. Change-Id: Ie2cf7c733718319437a823993c09778507c423ef Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Specify better increment for captured propertiesAlan Alpert2012-12-193-4/+4
|/ | | | | | | | There aren't that many captured properties, decreasing the increment will give better performance. Change-Id: Iddb17c695eda5513f2d038123f4c886e559d8f6a Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* test: Mark tst_qdeclarativetext as insignificantSergio Ahumada2012-12-181-0/+2
| | | | | | Task-number: QTBUG-21015 Change-Id: I5b0f3a607c182aec819bd525ce3b2a4f8b47791a Reviewed-by: Alan Alpert <aalpert@rim.com>
* Add minimal plugin importing to quick1 qmlplugindump toolv5.0.0Miikka Heikkinen2012-12-141-0/+2
| | | | | | | Task-number: QTBUG-28131 Change-Id: I9d38b7f2ec94dfd084e2ce23412c4a8348ffe7b4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: Added documentation for the quick1 demo applicationsv5.0.0-rc2Venugopal Shivashankar2012-12-1215-0/+398
| | | | | Change-Id: Iebc7c1e7202fed95abf231913b48cec75675e7f1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Backport PathView currentIndex fixes from Qt 5Bea Lam2012-12-123-37/+485
| | | | | | | | | | | | Backport 447e5acb880ebda498891623dc4009984cb73bc6 and 0fc361f96b06ba318e70610e46beb421753cae9d which fix bugs related to currentIndex. The first commit ensures currentIndex=0 when all items are removed; the second ensures that the initial currentIndex value is respected and also resets the view correctly if the model changes. Change-Id: I73266a211001a54163be8415d449802ff077a72e Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Fixed install path of tictactoe exampleOliver Wolff2012-12-121-1/+1
| | | | | Change-Id: I710152e833a74956060772d5e01772dea0298384 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Process imports in the order they appear in the code.Robin Burchell2012-12-1230-8/+177
| | | | | | | | | | | | | | | By placing imports into a hash keyed by the qualifier, imports were not processed in the order they appeared in the source. This is perhaps not a major problem, but it is nice to have predictability. This becomes more important in Qt 5, when QHash is randomly seeded at application startup, as alterations to order could have strange side effects on code. Reported-by: Maciej Blomberg Change-Id: Ibd34fab1eed4bc727b498ba4684c62d801ae713b Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix crash when mapping coordinates to & from the root item.Nicolas Tisserand2012-12-121-4/+18
| | | | | | | | | | | | | | | The crash triggered by our (supported & documented) use-cases (calling map{From,To}Item with a null value), has been introduced earlier this year, by this change: https://qt.gitorious.org/qt/qt/commit/bec02b3f3 Also: * Clarify QDeclarativeItem::map{From,To}Item statement ordering. * Handle the engine-less item corner case. Change-Id: I33678f7267a4b624bfa61247a643f37ad2ec735d Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Do not build Qt Quick 1 documentation and example manifest.hjk2012-12-111-1/+4
| | | | | | | | | It was decided to leave in the examples as reference, but not obviously refer to them in the documentation. Change-Id: I932a2a3fc983d5a8a63855ae94d509161fdfada4 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* centralize and fixup example sources install targetsOliver Wolff2012-12-11448-353/+3837
| | | | | | | | follow respective change in qtbase Change-Id: I15346e16cd1d6f30cf32a77284b5f19b1dd2a7a9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* make use of qt_headersclean.prfOswald Buddenhagen2012-12-112-53/+2
| | | | | Change-Id: I55d94c152217e419a2c8f04d174996a71eb933a5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make sure Q_DECLARE_METATYPE is used in all TUs it is registered in.Stephen Kelly2012-12-111-1/+2
| | | | | Change-Id: I0aea3bfcae77d22f04166ce7e04c9a4898e7f99b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix typo in metatype registration.Stephen Kelly2012-12-111-1/+1
| | | | | Change-Id: If0fd01464160259d634770908d5c284db2bbe582 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add qtdeclarative.qdocconf to get a example_manifest.xmlhjk2012-12-11555-1/+34
| | | | | Change-Id: I52b87947559c10d3e60af81fe8d4f3189dd1614e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Add PLUGIN_CLASS_NAME to qtquick1 pluginsMiikka Heikkinen2012-12-104-0/+4
| | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: Ia32d3dad2136d0fda468a538fe9be989e72c79eb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Stabilize tst_qdeclarativetimerAlan Alpert2012-12-052-24/+40
| | | | | | | | Use consistent timing on the unified timer instead of qWait Manual cherry-pick of 2ebb2fce87642ef0da8629bdb27164fffbdcdcb9 Change-Id: I76c402081062f7f6849bd421e90bc96f08e8d95a Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Remove 'com/nokia' string from autotestAlan Alpert2012-12-051-11/+11
| | | | | | | Missed this bit in commit 905537e032095790b4ac1607c5ca0de2ad412476 Change-Id: Ic318dbe7a48412e9689ca0f4506c7098d9f48b6a Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 22:37:57 +0000