summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Allow to disable mmk plugin explicitlyHEADmasterMartin Kampas2018-09-031-1/+4
| | | | | Change-Id: I05289474eb0e58af5b85cc86cab05933b0a68e15 Reviewed-by: Joona Petrell <joona.petrell@jollamobile.com>
* Fix QDoc configurationMartin Kampas2018-08-233-7/+30
| | | | | | | | | | | Issues fixed - Problem with linking examples - Index page not found - No QML Types node in TOC - No index page for C++ Classes node Change-Id: Ifb849008fb5329e2e66598848fde41cd64b0ec46 Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>
* Fix licensingJani Heikkinen2017-05-0951-2071/+585
| | | | | | | | | | - Update old FDL & BSD license headers - Change old LGPL3 license headers to LGPL - Delete old, unnecessary license files Task-number: QTBUG-57147 Change-Id: I443dd2f55caf50d62464e7764a4fb642b0538ded Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix build with -no-feature-libraryUlf Hermann2017-03-062-1/+16
| | | | | | | | | | Disable code that directly interacts with QPluginLoader or relies on QCoreApplication::libraryPaths(). For loading plugins from inside Qt code you can use QFactoryLoader. If QPluginLoader is necessary, please consider staticPlugins() and staticInstances(). Change-Id: I14e2e2b5437ddd74109a94cc47dd53f4459ea2f5 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Make more ctors explicitMarc Mutz2016-04-121-1/+1
| | | | | | | Added explicit where it was missing. Change-Id: Ibeac920086ce33f31b24dcf7c0bdd7506267ed42 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-04-122-4/+4
| | | | | | | | | | | | ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Task-number: QTBUG-45291 Change-Id: I3913c0f2413da79a74026318344b8bf2b94b52f2 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove WinCE vestigesAlex Blasche2016-04-123-11/+1
| | | | | | | | It is history since Qt 5.8/dev against which qtfeedback is supposed to work. Change-Id: I4018f1737447bbd76e3245273858be73fd4e7fcc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* purge symbian vestigesOswald Buddenhagen2016-04-128-47/+3
| | | | | Change-Id: I34c07f4750e1053c37dc725343629bc3d0486013 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Update QtFeedback license/copyright headersAlex Blasche2016-04-1174-1196/+3352
| | | | | Change-Id: I846dfcc339a23f0b9f998a2b2f220eb48b0cf6f2 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Link QtFeedback build against Qt/devAlex Blasche2016-04-111-4/+4
| | | | | Change-Id: Ifd5aa022d7ab86db82a349f1d075f923b82f2c13 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* version the LICENSE.*GPL filesOswald Buddenhagen2015-09-182-0/+0
| | | | Change-Id: I37d93281c732afaa945e798f460ec6f6c086b51a
* make QtFeedback claim 'feedback' plugin typeOswald Buddenhagen2014-09-161-0/+3
| | | | | Change-Id: Ie2e58724e191dd9f4790308d655266c9e637287b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* purge stale jsbackend dependencyOswald Buddenhagen2014-09-161-1/+0
| | | | | Change-Id: I49464147b872ff1138d48c22d9029881f6abacbf Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Update all plugins.qmltypes filesLiang Qi2013-05-291-7/+28
| | | | | | | | Task-number: QTBUG-31388 Change-Id: Id495c3db41335023fb55df1c6fd07a8d98ec3cc9 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Update qmldir filesLiang Qi2013-05-291-0/+2
| | | | | | Change-Id: Iaa44a1b27d7309696e0812c10747a3bfb029498a Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Add license files mandated by (L)GPL.Timo Jyrinki2013-04-104-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: If6c7eb427f60afa5c052a86f1c3721aa359c8406 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* define MODULE_VERSIONOswald Buddenhagen2013-03-051-0/+2
| | | | | | Task-number: QTBUG-29838 Change-Id: Ifab56170a03fac6f5862cc44615edc8860215897 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-102-3/+3
| | | | | | Change-Id: I6f2912926d736a30fa4eb3a03e9f9958b3f8c454 Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix signals usage caught by tst_HeadersSergio Ahumada2013-01-101-1/+1
| | | | | | | | Header contains `signals' - use `Q_SIGNALS' instead Change-Id: I9be6078661eb6e820438865d9dc28919941c9fdf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-161-1/+1
| | | | | | | | qt is already added by spec_pre.prf, warn_on and depend_includepath by default_pre.prf. Change-Id: I244abbd633b901585c71600961d88b7834b6aca8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* point dependencies to stable branchesOswald Buddenhagen2012-12-131-5/+5
| | | | | Change-Id: I3b0817a39c51b2bb09af75755bee17dd764be8c7 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* fix docs build: canonical naming of qdocconf fileOswald Buddenhagen2012-12-042-1/+1
| | | | | Change-Id: I062ee28a7729294a3d28a8051e66973dc29ffe6b Reviewed-by: hjk <qthjk@ovi.com>
* remove symbian vestigesOswald Buddenhagen2012-12-0413-115/+4
| | | | | Change-Id: I2841caece488ac2df959a26a47d245756b4d06a5 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* adjust to qt_plugin.prf changesOswald Buddenhagen2012-11-016-27/+6
| | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. Change-Id: I903c61ad18160412bf2a39fca2fda72d7d02f461 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pointless INCLUDEPATH additionsOswald Buddenhagen2012-11-015-10/+0
| | | | | | | QT+=feedback already does that. Change-Id: Iaffb2aa87013601c4348f0696ea76b14c9c1ce16 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make compile with -no-guiTasuku Suzuki2012-10-151-1/+1
| | | | | Change-Id: I71658a7722a9217000a03177f2b217e825d0bf9c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix project name in qdocconf file from generic to 'qtfeedback'Tor Arne Vestbø2012-10-121-13/+13
| | | | | Change-Id: I342f03d37a3d3e91be253479d6b2fe0b91e04b15 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Update docs after modularization of docsTor Arne Vestbø2012-10-115-754/+5
| | | | | | | | The global files now live in qtbase only, and are made available to the other modules via the $QT_INSTALL_DOCS variable. Change-Id: Ia369af8a6d1f1a74b84b37a63c7b1ab7ab8625e1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: adding documentation templates from qtbaseJerome Pasion2012-09-253-0/+751
| | | | | | | | | qdocconf files must included these templates for qdoc to produce HTML files. Task-number: QTBUG-27293 Change-Id: I5203df20b8b7b1450ca2d80796e40ded38f54ec6 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2459-1256/+1256
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I9c4a751fa94b68cee30105a7f7eeaf7fd7e1abf4 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-138-14/+1
| | | | | Change-Id: I8c8cb18405637019d0ed566b5cdf83d3040e75b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.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: Ie706262d09be3274da37c085a5adbeac7b3df7ac Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Use QMAKE_DOCSv5.0.0-beta1J-P Nurmi2012-08-222-14/+2
| | | | | Change-Id: I8f30072277864a6d9a42ffcd484d15c01a125f60 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-111-1/+1
| | | | | Change-Id: I478782cab056dc411996bfb884895c6942051a58 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Update import api to follow changes in qtdeclarative.Toby Tomkins2012-08-101-1/+1
| | | | | | | | Changes in 4a8a8953f70197a7ab7a62fcd01b1bc08051689e made to qtdeclarative require changes to the import api. Follow these changes. Change-Id: I1c333f915470c5abd792c88704fc3e23a280b05f Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Doc: Changed HTML filename of the main page.Jerome Pasion2012-08-031-1/+1
| | | | | | | | -index.html collides with the Qt 5 documentation -renamed qdoc file. Change-Id: I83d3a1fc2411dc07932c7973dcb5cf3049e6b8c2 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Added check for audio support to qfeedbackmmk testKurt Korbatits2012-08-031-5/+14
| | | | | | | | | QTBUG-25448 - skip test if QFeedbackFileEffect::supportedMimeTypes() returns empty list. Change-Id: Ie33eb2f45cb3b91bd06ce340592a946bd53de09f Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Set the Qt API level to compatibility mode in all tests.Thiago Macieira2012-08-018-0/+8
| | | | | | | | | | 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: I89868a1a30876c2dfdf2950fc816736e6d04721e Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiatesJerome Pasion2012-07-305-5/+7
| | | | | | | | | | -\qmlclass is now \qmltype -\instantiates is for QML types implemented in C++ Change-Id: Ia23873a5e1c9098054f3820355b826611ef19dab Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Harri Heine <harri.heine@nokia.com> Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
* Mark test as expected fail on mac platforms, and insignificant on win32.Toby Tomkins2012-07-302-3/+4
| | | | | | | | | | | Logic has been included to produce an expected failure on the mac platform. The insignificant_test flag has been added to the .pro file for the win32 platform as it is unstable. Task-number: QTBUG-25448 Change-Id: Ieaf6cead9b026659d533c86af32385da1984e2eb Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add the CMake directory created during unit testing to .gitignore.Stephen Kelly2012-07-231-0/+1
| | | | | Change-Id: I27ffdc4deb691287661d0be3702f11502d192097 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Test that the package configs for QtFeedback work.Stephen Kelly2012-07-205-0/+90
| | | | | Change-Id: Id1e7a66c8beaf50c6e1ba78c83f922ead0a54244 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Documentation: Changed the title of index.qdoc pageHarri Heine2012-07-110-0/+0
| | | | | Change-Id: I332d1943d3486e7df081c379aa0c065d9729e623 Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
* use centralized qml plugin project handlingOswald Buddenhagen2012-07-112-54/+2
| | | | | Change-Id: Ic76330ac0ed10216412649b9abc7de73a730e2f0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* use centralized handling of QT_BUILD_PARTSOswald Buddenhagen2012-07-111-16/+1
| | | | | Change-Id: Id4e0244015c828d855e4f3485cf18ef77e48e3d6 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update the export macros in qtfeedback.gitThiago Macieira2012-07-111-21/+5
| | | | | | | Use the new, simpler QT_STATIC macro. Change-Id: Idb0791760ccdbd0ba692d00b033209a4cbab365f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-268-19/+7
| | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless DEFINES+=QT_MAKEDLL Change-Id: Ide1099c5e742e7c9a17d2775645381cb0c6b321f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-263-22/+1
| | | | | Change-Id: I008b9ade01b3f043d8e0cdc6653104a4e9d578b2 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fixed whitespace.Toby Tomkins2012-06-081-1/+2
| | | | | Change-Id: I4fc18eaf147f1bc65bc04608ebd5ef1843e1138d Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix plugin compilation errors related to qtbase plugin changes.Toby Tomkins2012-06-066-6/+3
| | | | | | | | | | The qtfeedback plugin changes had been performed in checkin 9610e64f3efe591621548e90e64d0e21cbfaea98 . However this modification did not take into consideration other test code. This changes moves testplugin implementation to the newer style. Change-Id: I5ec6f5cd52369d6a49ad28700fd5a4786a5fd765 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>