Commit Graph

124 Commits

Author SHA1 Message Date
Martin Kampas a14bd0bb13 Allow to disable mmk plugin explicitly
Change-Id: I05289474eb0e58af5b85cc86cab05933b0a68e15
Reviewed-by: Joona Petrell <joona.petrell@jollamobile.com>
2018-09-03 09:16:11 +00:00
Martin Kampas 4b552545fd Fix QDoc configuration
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>
2018-08-23 12:44:38 +00:00
Jani Heikkinen ee2387fef8 Fix licensing
- 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>
2017-05-09 09:57:01 +00:00
Ulf Hermann 1c93646980 Fix build with -no-feature-library
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>
2017-03-06 14:18:50 +00:00
Marc Mutz 9ac8d8c272 Make more ctors explicit
Added explicit where it was missing.

Change-Id: Ibeac920086ce33f31b24dcf7c0bdd7506267ed42
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-04-12 09:04:57 +00:00
Marc Mutz c2f6e18278 Make public headers compile with -Wzero-as-null-pointer-constant
... 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>
2016-04-12 09:04:51 +00:00
Alex Blasche eb525425ba Remove WinCE vestiges
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>
2016-04-12 06:04:52 +00:00
Oswald Buddenhagen de26e10992 purge symbian vestiges
Change-Id: I34c07f4750e1053c37dc725343629bc3d0486013
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
2016-04-12 06:04:49 +00:00
Alex Blasche 596bf45358 Update QtFeedback license/copyright headers
Change-Id: I846dfcc339a23f0b9f998a2b2f220eb48b0cf6f2
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-04-11 13:29:36 +00:00
Alex Blasche 4d22329681 Link QtFeedback build against Qt/dev
Change-Id: Ifd5aa022d7ab86db82a349f1d075f923b82f2c13
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-04-11 13:29:33 +00:00
Oswald Buddenhagen 28ca624149 version the LICENSE.*GPL files
Change-Id: I37d93281c732afaa945e798f460ec6f6c086b51a
2015-09-18 13:54:47 +02:00
Oswald Buddenhagen 862de791d7 make QtFeedback claim 'feedback' plugin type
Change-Id: Ie2e58724e191dd9f4790308d655266c9e637287b
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2014-09-16 13:10:57 +02:00
Oswald Buddenhagen e71e74979b purge stale jsbackend dependency
Change-Id: I49464147b872ff1138d48c22d9029881f6abacbf
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2014-09-16 13:10:55 +02:00
Liang Qi dea0da7265 Update all plugins.qmltypes files
Task-number: QTBUG-31388

Change-Id: Id495c3db41335023fb55df1c6fd07a8d98ec3cc9
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2013-05-29 18:40:33 +02:00
Liang Qi efdebe3def Update qmldir files
Change-Id: Iaa44a1b27d7309696e0812c10747a3bfb029498a
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2013-05-29 18:40:31 +02:00
Timo Jyrinki eb48acef40 Add license files mandated by (L)GPL.
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>
2013-04-10 07:48:15 +02:00
Oswald Buddenhagen e2794d1433 define MODULE_VERSION
Task-number: QTBUG-29838
Change-Id: Ifab56170a03fac6f5862cc44615edc8860215897
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-03-05 14:50:06 +01:00
Oswald Buddenhagen fec8a0c66f make use of qtHaveModule()
Change-Id: I6f2912926d736a30fa4eb3a03e9f9958b3f8c454
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-01-10 18:42:24 +01:00
Sergio Ahumada dddbd81a06 Fix signals usage caught by tst_Headers
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>
2013-01-10 18:42:21 +01:00
Oswald Buddenhagen ac2dc5c022 remove some unnecessary CONFIG additions
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>
2012-12-16 21:59:50 +01:00
Oswald Buddenhagen b962c731bd point dependencies to stable branches
Change-Id: I3b0817a39c51b2bb09af75755bee17dd764be8c7
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-12-13 22:46:57 +01:00
Oswald Buddenhagen e58576f8a2 fix docs build: canonical naming of qdocconf file
Change-Id: I062ee28a7729294a3d28a8051e66973dc29ffe6b
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-04 12:40:53 +01:00
Oswald Buddenhagen c9e2d01358 remove symbian vestiges
Change-Id: I2841caece488ac2df959a26a47d245756b4d06a5
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2012-12-04 12:40:34 +01:00
Oswald Buddenhagen d22ba2dd01 adjust to qt_plugin.prf changes
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>
2012-11-01 22:37:07 +01:00
Oswald Buddenhagen e05a1b3750 remove pointless INCLUDEPATH additions
QT+=feedback already does that.

Change-Id: Iaffb2aa87013601c4348f0696ea76b14c9c1ce16
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-11-01 22:37:01 +01:00
Tasuku Suzuki 0d85e95a06 make compile with -no-gui
Change-Id: I71658a7722a9217000a03177f2b217e825d0bf9c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-10-15 13:48:02 +02:00
Tor Arne Vestbø 5741e9813c Fix project name in qdocconf file from generic to 'qtfeedback'
Change-Id: I342f03d37a3d3e91be253479d6b2fe0b91e04b15
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-10-12 04:42:10 +02:00
Tor Arne Vestbø 1a8c5807a1 Update docs after modularization of docs
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>
2012-10-11 15:47:58 +02:00
Jerome Pasion 7deab3943d Doc: adding documentation templates from qtbase
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>
2012-09-25 13:59:46 +02:00
Iikka Eklund f1172bda9a Change copyrights from Nokia to Digia
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>
2012-09-24 10:55:03 +02:00
Oswald Buddenhagen dcddd149fa centralize load(qt_build_config)s in .qmake.conf
Change-Id: I8c8cb18405637019d0ed566b5cdf83d3040e75b3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-09-13 19:03:27 +02:00
Thiago Macieira 019d810f41 Update the git-archive export options
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>
2012-09-03 19:52:17 +02:00
J-P Nurmi 58b8233d7e Use QMAKE_DOCS
Change-Id: I8f30072277864a6d9a42ffcd484d15c01a125f60
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2012-08-22 15:47:11 +02:00
Oswald Buddenhagen 3bbb3cf54f follow rename of qt_module_config.prf to qt_module.prf
Change-Id: I478782cab056dc411996bfb884895c6942051a58
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-11 13:36:18 +02:00
Toby Tomkins d0e34dbc4b Update import api to follow changes in qtdeclarative.
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>
2012-08-10 07:47:51 +02:00
Jerome Pasion 5d33f75568 Doc: Changed HTML filename of the main page.
-index.html collides with the Qt 5 documentation
-renamed qdoc file.

Change-Id: I83d3a1fc2411dc07932c7973dcb5cf3049e6b8c2
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
2012-08-03 12:44:43 +02:00
Kurt Korbatits ec381a6cdb Added check for audio support to qfeedbackmmk test
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>
2012-08-03 00:56:11 +02:00
Thiago Macieira eba8364129 Set the Qt API level to compatibility mode in all tests.
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>
2012-08-01 22:27:27 +02:00
Jerome Pasion c22668590a Doc: Changed \qmlclass to \qmltype and added \instantiates
-\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>
2012-07-30 09:51:46 +02:00
Toby Tomkins 1803ec3f5d Mark test as expected fail on mac platforms, and insignificant on win32.
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>
2012-07-30 05:53:45 +02:00
Stephen Kelly 57037e2827 Add the CMake directory created during unit testing to .gitignore.
Change-Id: I27ffdc4deb691287661d0be3702f11502d192097
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2012-07-23 10:26:54 +02:00
Stephen Kelly dde6b3a9ad Test that the package configs for QtFeedback work.
Change-Id: Id1e7a66c8beaf50c6e1ba78c83f922ead0a54244
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-20 07:27:39 +02:00
Harri Heine 417dddb7f7 Documentation: Changed the title of index.qdoc page
Change-Id: I332d1943d3486e7df081c379aa0c065d9729e623
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
2012-07-11 23:44:59 +02:00
Oswald Buddenhagen 848ac33a7e use centralized qml plugin project handling
Change-Id: Ic76330ac0ed10216412649b9abc7de73a730e2f0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-11 23:44:55 +02:00
Oswald Buddenhagen d520dca735 use centralized handling of QT_BUILD_PARTS
Change-Id: Id4e0244015c828d855e4f3485cf18ef77e48e3d6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-07-11 23:44:52 +02:00
Thiago Macieira 57aa2f0a11 Update the export macros in qtfeedback.git
Use the new, simpler QT_STATIC macro.

Change-Id: Idb0791760ccdbd0ba692d00b033209a4cbab365f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-11 23:44:49 +02:00
Oswald Buddenhagen f4439886f1 build system cleanups
- 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>
2012-06-26 14:56:04 +02:00
Oswald Buddenhagen 846dfb4eeb auto-generate module pris
Change-Id: I008b9ade01b3f043d8e0cdc6653104a4e9d578b2
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-26 14:56:01 +02:00
Toby Tomkins b6beef13c5 Fixed whitespace.
Change-Id: I4fc18eaf147f1bc65bc04608ebd5ef1843e1138d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-06-08 02:23:38 +02:00
Toby Tomkins 44a568096f Fix plugin compilation errors related to qtbase plugin changes.
The qtfeedback plugin changes had been performed in checkin
9610e64f3e . 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>
2012-06-06 07:27:31 +02:00