summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/qt.prf
Commit message (Collapse)AuthorAgeFilesLines
* Remove unmaintained and broken VNC platform pluginJohannes Zellner2012-03-151-1/+1
| | | | | | | Change-Id: Ie0a07c3a6822870b095a20d997b63fb1635f20be Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Robert Griebl <robert.griebl@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* fix the check for libraries having themselves as dependenciesOswald Buddenhagen2012-03-091-2/+3
| | | | | | Change-Id: I6dc56228a068fe9158e989afd1c545a3d69848e6 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* replace uses of QMAKE_INCDIR_QT and QMAKE_LIBDIR_QT with module-specific ↵Oswald Buddenhagen2012-03-081-1/+1
| | | | | | | variables Change-Id: Id410887fa97f345a229e0cbf395633ccf303fa2f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* transitively resolve module dependenciesOswald Buddenhagen2012-03-061-19/+15
| | | | | | | | | otherwise we need the nasty hack for includes, and CONFIGs and DEFINES from dependencies are not included at all. Change-Id: I7eaee761161a6e8fbac8e9237d26559aa11a88a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Merge master -> api_changesRohan McGovern2012-02-291-1/+1
|\ | | | | | | | | | | Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac. Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
| * simplify loop over modulesOswald Buddenhagen2012-02-281-1/+1
| | | | | | | | | | | | | | | | the earlier done topological sort already removes duplicates and only works with lower-cased names anyway, so we can remove the overhead here. Change-Id: I44fc39af9e94662717e1c8cfb0ddb87d2f597935 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | Add workaround for projects using 'QT += declarative'Matthew Vogt2012-02-271-0/+27
|/ | | | | | | | | | | | | | | | | | | | | | | The code previously exported by the declarative library has been migrated to the qml and quick libraries, and the symbol names have been changed accordingly. To allow existing projects to continue to build, the declarative module now contains a set of definitions redefining the deprecated class names to their replacement names. To make this work, a dependency on the declarative module now automatically adds a dependency on the qml module in order to make the new library available for linking. This is a temporary change to prevent breaking existing projects that depend on the declarative module. After clients have had an opportunity to update their code to the use the new interfaces, it can be removed. Task-number: QTBUG-23737 Change-Id: Idee6ac627858856802bb1be29e9a4a079da73688 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Moving tiff image format support and libtiff out of qtbaseaavit2012-01-311-1/+1
| | | | | | | | | | The tiff plugin and bundled libtiff is moving to the qtimageformats project on Gerrit. Task-number: QTBUG-23887 Change-Id: I4c848232fdccddd7e7f54215f9eaa78dc4c3a53d Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove support for the MNG file format and the bundled libmngaavit2012-01-251-1/+1
| | | | | | | | | | | | | The MNG file format is generally abandoned, and libmng has been unmaintained for several years. The MNG plugin and bundled libmng has been moved to the qtimageformats project on Gerrit. Task-number: QTBUG-21869 Change-Id: I946432347014ffde2b72307a5f8b166ca5553602 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fixed automatic plugin path resolving for predefined Qt plugins.Janne Anttila2012-01-241-7/+13
| | | | | | | | | | | | | | | | When Qt is configured for static build, importing static plugins is supposed to work as described in docs: http://doc.qt.nokia.com/latest/qtplugin.html#Q_IMPORT_PLUGIN This commit updates the qmake mapping for predefined Qt plugins, so that Qt plugins are automatically found when QTPLUGIN keyword is used. Task-number: QTBUG-18609 Merge-request: 1391 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 0d0c1082f74888044713d96deca2d510951d018a) Change-Id: I0d0c1082f74888044713d96deca2d510951d018a Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Remove warning and automagic for "missing QT += quick"Kent Hansen2012-01-191-9/+0
| | | | | | | | | | | | | | | | This reverts commit 613183ff8c101fe544814259197d897b3540bc85 ("Automatically add QtQuick module if only QtDeclarative is specified"). The QtQuick module has been around for a while now, and the need to port to it has been duly announced. After this commit, projects that use the QtQuick 2 API (QQuickItem and friends) will explicitly have to add QT += quick. Change-Id: Ie5e6d438431a0c736e214c28c0d1ba1189b4ee06 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Automatically add QtQuick module if only QtDeclarative is specifiedKent Hansen2011-12-021-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtQuick and related APIs (QQuickItem, SceneGraph, et al), which used to live in the QtDeclarative module, have moved to a new module, QtQuick. Existing projects that use QtQuick-specific APIs should add "quick" to their project's QT variable, and update their include statements. E.g., QT += declarative should be changed to QT += declarative quick and #include <QtDeclarative/qquickitem.h> should be changed to #include <QtQuick/qquickitem.h> and similarly for the other QtQuick classes. In order to give existing projects a chance to migrate smoothly, we should issue a warning and automatically add the QtQuick module if only the QtDeclarative module was specified. (If a project doesn't use any QtQuick APIs, the warning can be ignored -- but there is no way to disable it.) This change, along with the compatibility headers in QtDeclarative, make it possible to build existing projects without any modifications on the project's side. This change will be removed at a later time; when that happens, existing projects that did not port to the QtQuick module will no longer build. Change-Id: I56abcadc1e5c74490527fc03646310d801bfc084 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add a -force-asserts option to configureHarald Fernengel2011-11-111-0/+1
| | | | | | | | | | | We have the following scenario: Either you build a release package without asserts, or a debug package with asserts. However, in embedded development, we need asserts also in release packages. This flag allows you to build a release package, but Q_ASSERTs still fire. Change-Id: Icd1dd4dd63c3cafecf515b40741263d902ad42d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* qmake: remove symbian supportJoerg Bornemann2011-11-071-8/+0
| | | | | Change-Id: I1db834500921681676a6f46e7750bdd81bf0093d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QtBase: Move idc to Active Qt.Friedemann Kleint2011-10-101-1/+0
| | | | | | | | | Remove include path to Active Qt from qt.prf. Change-Id: I476152ce56e47b573f5c835ec1347e772c4e9c3e Reviewed-on: http://codereview.qt-project.org/6355 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Remove stale QtDeclarative dependency on QtOpenGLKent Hansen2011-09-201-2/+0
| | | | | | | | | | | | QtDeclarative doesn't link against QtOpenGL anymore. This line was implicitly causing the QtWidgets library to get linked in as well. Change-Id: I56e6e9db52eec7fc924506bfeb4b7931ea04e616 Reviewed-on: http://codereview.qt-project.org/5204 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* fix misnomer: $$resolve_depends() => $$sort_depends()Oswald Buddenhagen2011-07-111-1/+1
| | | | | | | | | ... and re-add a real $$resolve_depends(), just in case. Change-Id: I489d6056546340ce95280fe7fd571e30c14470e7 Reviewed-on: http://codereview.qt.nokia.com/1455 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* make 1st argument of $$resolve_depends a variableOswald Buddenhagen2011-07-111-1/+1
| | | | | | | | | | this is braindead, but it's consistent with the rest of qmake and more performant. and the argument error message claimed it already anyway. Change-Id: I973368acc6ffbff17107085ccd68b0334cc3e681 Reviewed-on: http://codereview.qt.nokia.com/1436 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Only add dependent include when not already thereMarius Storm-Olsen2011-05-271-1/+1
| | | | | | Change-Id: I517ad8188a6f6b5ade763f0189f434f446ab6f05 Reviewed-on: http://codereview.qt.nokia.com/198 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-stagingGunnar Sletta2011-05-041-1/+17
|\
| * Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-021-1/+17
| | | | | | | | | | | | | | This will allow us to expose private headers in a controlled manner, and ensure that they are not used by accident. This also means that we internally will have to enable the private headers for the modules we wish to use in the project.
* | QT += declarative implies += opengl too, so hardcode it to make stuff workGunnar Sletta2011-04-281-0/+3
|/
* Add QMAKESPEC_ORIGINAL to the INCLUDEPATH when neededMarius Storm-Olsen2011-04-271-0/+5
|
* Made modules that depend on other modules add their include paths.Marius Storm-Olsen2011-04-271-0/+6
| | | | | | | | This is needed so that header files which contain references to those modules (for example in templates) will have their include paths as well. RevBy: axis
* Make qt.prf use new qt_module.pri structure for QT variableMarius Storm-Olsen2011-04-271-71/+16
| | | | This change requires the new resolve_depends(var, prefix) function in qmake.
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+221
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 08:45:29 +0000