summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Remove ifdefs for supporting Mac OS <= 10.5Tor Arne Vestbø2013-02-182-8/+0
| | | | | | | | Qt5 requires Mac OS 10.6, so we can remove checks such as if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 Change-Id: Iea21727a277291148704ecf9677ed0b68c24920f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Giuseppe D'Angelo2013-02-1715-202/+229
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-1415-202/+229
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/concurrent/doc/qtconcurrent.qdocconf src/corelib/doc/qtcore.qdocconf src/corelib/global/qglobal.h src/dbus/doc/qtdbus.qdocconf src/dbus/qdbusmessage.h src/gui/doc/qtgui.qdocconf src/gui/image/qimagereader.cpp src/network/doc/qtnetwork.qdocconf src/opengl/doc/qtopengl.qdocconf src/opengl/qgl.h src/plugins/platforms/windows/qwindowswindow.cpp src/printsupport/doc/qtprintsupport.qdocconf src/sql/doc/qtsql.qdocconf src/testlib/doc/qttestlib.qdocconf src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf src/widgets/doc/qtwidgets.qdocconf src/xml/doc/qtxml.qdocconf Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629
| | * If the libdir is absolute, make the config file non-relocatable.Stephen Kelly2013-02-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | If Qt is configured with -libdir /some/dir/outside/the/install/prefix/, then for use absolute paths for the executables and include dirs too. Change-Id: I5ccf62be6f93f97d934df62038fe4cd40dca9a93 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * use install path as fallback when locating toolsOswald Buddenhagen2013-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all non-installed tools are properly registered, so they don't need the fallback. conversely, we can assume that non-registered tools are already installed. this enables us to build docs in qtbase after an incremental build+install up to qttools. Change-Id: I95a55f6b84e01885bcf6dd656caf0dd2b679bb73 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Fix regex for determining if a path is relative.Stephen Kelly2013-02-111-4/+4
| | | | | | | | | | | | | | | Change-Id: I3d638220e16c215b737417c2bf8de02ddf4a8199 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Don't duplicate the 'top-level' include dir in all modules.Stephen Kelly2013-02-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the <prefix>/include directory which is independent of the module and which only has to be used once. As everything uses QtCore, it is enough to set it only there. The CI system is a special case, in that it tests things before installation. Handle that case too. Change-Id: Idcdf9617e199b7d490cb3553cce07f1f464b3bec Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * Include the CMake Extras file and the Macros file only once.Stephen Kelly2013-02-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the Extras file can do things like append to a property (as in QtCore for include directories), that is something that should be done only once when the QtCore target is first defined. Change-Id: I5163912bccfda1ff43a02eb01f67ac59e6f6b24b Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * ensure consistent pkg-config file naming for macx qt frameworksOswald Buddenhagen2013-02-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the pkg-config file names follow the TARGET by default. as we create frameworks without the major version infix, all references to Qt5* would be invalid. Task-number: QTBUG-29453 Change-Id: I82e7de017a8f17f7d2d7b4a2a61a180125ca29a0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * beautify the pkg-config Name: fieldOswald Buddenhagen2013-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | it's not used for anything other than display, so we can put a space there. Change-Id: I77e156856efeaaa964ff3bf2369bcd5586bac7c6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * export QT_CONFIG only in Qt5Core.pcOswald Buddenhagen2013-02-061-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | there is no point in duplicating the information in every module. host_bins is exported only here as well. Change-Id: I2f816e1cade9761a2c0d97c7ca1c90293095bfb1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * export QT_CONFIG instead of CONFIG to .pc filesOswald Buddenhagen2013-02-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | users need access to the Qt configuration, not some internals of module's build system. Change-Id: Ife3f668282969d444282d57152c11ed0f741076f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * fix transitive linking for x-buildsOswald Buddenhagen2013-02-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -rpath does *not* imply -rpath-link when x-building: ld(1): "Searching -rpath in this way is only supported by native linkers and cross linkers which have been configured with the --with-sysroot option." it doesn't hurt to have the "excess" -rpath-link for native builds, so just remove the cleanup. Change-Id: Ic39c1f4d6c2e3770d43a5ed3e56cf89a146edf85 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * fix lack of rpath-link when using modules from final locationOswald Buddenhagen2013-02-043-53/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if the libraries are in a non-standard location, but no rpath is used, rpath-link is needed. this is often the case for non-prefix builds (which have no forwarding pris any more). as we cannot store absolute paths in the final pris, we need to store the module names, and resolve them only at use time. Change-Id: I1538b5d531611c76a2d7058a3b2ff683bdcbe427 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Merge "Merge branch 'release' into stable" into refs/staging/stableSergio Ahumada2013-02-018-175/+206
| | |\
| | | * Merge branch 'release' into stableSergio Ahumada2013-01-318-175/+206
| | | |\ | | | | | | | | | | | | | | | Change-Id: If3aa1b7ed75082eff6e9761ad82c83691135ed60
| | | | * don't create forwarding module pris for non-prefix buildsOswald Buddenhagen2013-01-311-62/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as everything is built inside the common build/install dir, there is no point in the fwd pri stuff. as a "side effect", this makes it more straight-forward to relocate non-prefix builds, which is the default on windows. Task-number: QTBUG-28827 Change-Id: I010246a9ad87cf74974dc168768b1a8625f73260 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | | | * qt_module_fwdpri.prf => qt_module_pris.prfOswald Buddenhagen2013-01-312-60/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move the regular pri file creation into the "sub-prf" and rename it accordingly. the original reason for the split was the deep magic in activeqt (and phonon), which is gone now. Change-Id: If40e941afc9293725630ed6bcf3e4ef18a692f66 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | | | * centralize detection of prefix buildsOswald Buddenhagen2013-01-315-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this makes the use sites more expressive Change-Id: Ib879de65d1cc26462fa61f5339e951f294515faf Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | | | * do not actually build examples in production buildsOswald Buddenhagen2013-01-311-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -developer-build enables an actual build of examples, based on the assumption that developers want to test it (it can be still disabled with -nomake examples). regular users otoh want only the examples sources installed. Change-Id: Ifc6a108099929175a3960480802b271a758fdd38 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | | | * fix duplicated installation of qml example filesOswald Buddenhagen2013-01-311-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we need to collect the sources of the install targets for the check that all files have been properly handled, but of course we must not add these files to the source install target, as that would mean double installation. Change-Id: I6acb56f2a993b6ed81d1031d5dc0a0da30a53b54 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | | | * explicitly set QMAKE_PKGCONFIG_NAMEOswald Buddenhagen2013-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise qmake will just take TARGET and lowercase and capitalize it, which not only looks weird, but also does not match the Requires: fields we generate. Change-Id: I4a070ff256fffd2b780acb0361d4213d0032dbb9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Dihan Wickremasuriya <nayomal@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | | | * include all module dependencies into pkg-config Requires: fieldOswald Buddenhagen2013-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously, we'd miss the -private ones (which imply the non-private version). Change-Id: Ib5ae2afaa5b5efda9639b7cc4a080432f2fcce2a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Dihan Wickremasuriya <nayomal@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | | | * use correct module names in pkg-config Requires: fieldOswald Buddenhagen2013-01-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29309 Change-Id: Id22d4e2707ceb3421dc6eb5effe16a03c4769d26 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | | substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-011-0/+7
| | |/ / | | | | | | | | | | | | | | | | | | | | Change-Id: Ie57765c10a8e90d6fc74ee5a8fd84bfc7cd8bcf2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * | fix path adjustments in installed metafilesMark Brand2013-01-302-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28902 Change-Id: Ia70da8f0f0b7abb4ea2a46cb4068c0827888b322 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | adjust paths in installed prl files for mingwMark Brand2013-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Curiously, qmake could fix .prl and .pc files for unix, but only .pc files for MinGW. qt_module.prf seems to have known this. Task-number: QTBUG-28902 Change-Id: Ice9983a69813690c0d4b96ca11589440182569a0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | adjust paths in installed module metafiles from modular buildMark Brand2013-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fully modular prefix build now puts the includes and libs into each module's own builddir, so the else branch was simply bogus. Replaced the else branch with the real base for modular builds. This allows the paths to be successfully replaced when installing metafiles. Change-Id: I056a923288965b560a4e9b0ba7add1aac912199f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | | purge vestiges of QMAKE_LFLAGS_QT_DLLOswald Buddenhagen2013-02-131-1/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia86b9cee1044ab915854e0e231e1b3d5d66e1f7d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | | purge QMAKE_LIBS_OPENGL_QTOswald Buddenhagen2013-02-1349-49/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | it differed from QMAKE_LIBS_OPENGL only for the irix/sco/unixware -cc specs for not entirely obvious reasons. as all these specs are obsolete, remove it. Change-Id: I7d50ffa11ff830371ea52c9ebe25e1f1bc56b307 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Refactor QEglFSPandaHooks and add physicalScreenSize()Gunnar Sletta2013-01-301-64/+1
| | | | | | | | | | | | | | | Change-Id: I5a198af5347cc1fdce97031e0a1be99b2120c3ac Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-281-21/+20
|\| | | | | | | | | | | Change-Id: I12b4d8b99bdccae53b1a978cd6eb8f4ac6fb3c76
| * | Use new path manipulation functions from qmake.Stephen Kelly2013-01-241-21/+20
| | | | | | | | | | | | | | | | | | | | | | | | This is a less error-prone way to calculate relative paths. Task-number: QTBUG-29110 Change-Id: If4509ef278e48dcf08bdcc904d21534b4c05993f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-22149-145/+243
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qsavefile_p.h src/corelib/tools/qregularexpression.cpp src/gui/util/qvalidator.cpp src/gui/util/qvalidator.h Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825
| * | Update copyright year in Digia's license headersSergio Ahumada2013-01-18145-145/+145
| | | | | | | | | | | | | | | Change-Id: Ic804938fc352291d011800d21e549c10acac66fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | Device mkspec for BlackBerry PlaybookRafael Roquetto2013-01-164-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4a437ce2da7c94b49c747e9fcdc9ec622ef51ddc Reviewed-by: Donald Carr <sirspudd@gmail.com> Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Android-eglfs: Fixed build against Android 4.0.xSamuel Rødal2013-01-212-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | The header location for SurfaceComposerClient.h changed between Android 4.0 and 4.1, so we need to select based on the major and minor version. Change-Id: I7a6408f8ba3c644facca3a7e64b8d68fde9c4472 Reviewed-by: aavit <eirik.aavitsland@digia.com> Reviewed-by: Rainer Keller <rainer.keller@digia.com>
* | | Android-eglfs: Added support for non-composited rendering.Samuel Rødal2013-01-182-2/+64
| | | | | | | | | | | | | | | | | | | | | | | | By using FramebufferNativeWindow Qt can render directly without going through the SurfaceFlinger compositor. Change-Id: I0538fca9f2e905c076ff5837dd73589ee9c632ca Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-164-7/+9
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/widgets/styles/qstyleanimation.cpp Change-Id: Iae570895be6544de80f9c1ec309d1a08c59daff8
| * | Merge remote-tracking branch 'gerrit/release' into stableFrederik Gladhorn2013-01-151-2/+0
| |\| | | | | | | | | | Change-Id: Ieb104d0e390218a063082c93bc9c7e412af2166d
| | * remove definitions of QMAKE_{LIB,INC}DIR_QTOswald Buddenhagen2013-01-111-2/+0
| | | | | | | | | | | | | | | | | | | | | they are gone from all other specs Change-Id: I93f5800971733af9d9dbc66c7a900d1e2e967473 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | Fix QtBase cross compilation in debug mode for iMX6 targets.Milian Wolff2013-01-141-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The platform specific CFLAGS, most notably -march=armv7-a, were only added to QMake's _RELEASE flags but not to the _DEBUG flags. This then resulted in strange compilation errors such as this one: http://qt-project.org/forums/viewthread/22141 Change-Id: Ib47996c6946b043294437e8543827da270df836d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Support MinGW for CTest test casesJonathan Liu2013-01-091-1/+2
| | | | | | | | | | | | | | | Change-Id: I581701f0b830292a21bc805da0398cbc96f82918 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * | The executables always go into QT_HOST_BINS.Stephen Kelly2013-01-091-1/+1
| |/ | | | | | | | | | | | | | | Task-number: QTBUG-28922 Change-Id: I7afaee292a0026d67866e4f1f711296adee8f8de Reviewed-by: Andy Nichols <andy.nichols@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-01-091-5/+9
|\| | | | | | | Change-Id: I7f0dab6bdb1f3cc1d3e6c30166ff6db9dfae37e9
| * fix QMAKE_MAKE for qtCompileTest for cross building modulesMark Brand2013-01-071-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | Cross bulding on unix for mingw exploits the fact that makefiles generated for mingw work with plain make. There is no mingw32-make, so this is the only option. Arguably, plain make could also be used in an MSYS environment, perhaps detected by MINGW_IN_SHELL, but there might be good reasons I don't know about not to do this. Change-Id: I694c74046a307c2887af1c30cca36f95e242adc1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge branch 'stable' into devFrederik Gladhorn2013-01-0443-189/+528
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: examples/widgets/painting/shared/shared.pri src/corelib/tools/qharfbuzz_p.h src/corelib/tools/qunicodetools.cpp src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp src/plugins/platforms/windows/qwindowsfontdatabase.cpp Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
| * add and use qtHaveModule() functionOswald Buddenhagen2012-12-212-1/+8
| | | | | | | | | | | | | | | | | | | | | | this is much more elegant than the so far propagated !isEmpty(QT.foo.name). also replace feature-specific tests (no-gui and no-widgets) and the obsolete contains(QT_CONFIG, foo) syntax. Change-Id: Ia4b3c8febcabf9eeca67b1f9173a523820b1038b Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Fix main() signature of headersclean stub fileKai Koehne2012-12-211-1/+1
| | | | | | | | | | | | | | Fix MinGW build errors by using the standard main signature. Change-Id: I0ebe7307a825a7ec50e654f163fbf8fe7060a478 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Merge "Merge 'release' into stable" into refs/staging/stableOswald Buddenhagen2012-12-214-27/+5
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 12:56:07 +0000