summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Fix the library names on MinGW.Stephen Kelly2012-02-241-10/+20
| | | | | | Change-Id: I6c2008a0e7a07ca0603b8aa9362d31fa4ef7310a Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add the QtMain windows library to the CMake files.Stephen Kelly2012-02-231-0/+9
| | | | | | | | Change-Id: Iff8b9bdd4b069721103e1cd5854e56b6116d7549 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Use -fPIE on QNXSean Harmer2012-02-231-0/+2
| | | | | Change-Id: Iec065f528f5edd848be580807a607488dc2e401f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use QMAKE_SUBSTITUTIONS conditionalsStephen Kelly2012-02-221-38/+38
| | | | | | | Instead of generating CMake conditionals. Change-Id: I3d987cc08666270e618222be9292558e73bc961e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Give the compile flags an EXECUTABLE_ prefix.Stephen Kelly2012-02-211-0/+4
| | | | | | | | The fPIE flag should only be used with executables. Change-Id: If799ae4a7fe2492af3aac67651659a52d365024a Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Make sure that we pick up xcb from pkg-configJørgen Lind2012-02-201-0/+4
| | | | | | | | and run the configure checks with the values Change-Id: Ie8e0072c686c6a7dce1d02e25a9c1abce4679d34 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix LSB mkspecHarald Fernengel2012-02-201-88/+10
| | | | | | | Use the standard g++ specs, just override the compiler name Change-Id: I4adacd7204d3880155bdfc3405e20f322ad593ea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix "check" target when load(testcase) is used in .pro file.Miikka Heikkinen2012-02-171-2/+2
| | | | | | | | | | | | | | The "check" target always depended on debug-check on projects that explicitly loaded the testcase.prf, even if Qt was configured with -release parameter. This obviously caused build failure. Changed the testcase.prf to check which configuration is preferred using CONFIG(debug, debug|release) like is done with similar cases in other .prf files. Task-number: QTBUG-24332 Change-Id: Ib5140b106e99efe51932bdd5a48914786de23230 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove usages of QT_ARCH and QT_ARCH_* from qtbaseBradley T. Hughes2012-02-172-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The architecture is detected at compile time based on the predefined macros from the compiler. Don't use QT_ARCH in .pro, .pri, or .prf files. The PNG_NO_ASSEMBLER_CODE define from libpng.pri is not present in the current copy of src/3rdparty/libpng, so no change in functionality is expected. The conditional for the SUPPORT_JIT define in pcre.pri is moved to src/3rdparty/pcre/config.h, again so that we can use the compiler's predefined macros to detect the architecture at compile time. Replace QT_ARCH_ARM, QT_ARCH_MIPS, and QT_ARCH_SPARC with their Q_PROCESSOR_* equivalents. Replace QT_ARCH_INTEGRITY, QT_ARCH_VXWORKS, and QT_ARCH_WINDOWSCE with their Q_OS_* equivalents. Note that this commit also effectively disables the SPARC atomic implementation. An inline implementation for SPARC needs to be added, or we remove the current code and instead rely on the GCC intrinsic or C++11 std::atomic support on SPARC. Note also that this commit does not remove QT_ARCH from configure or qconfig.h. This will continue to be set until all Qt 5 projects can be moved away from using QT_ARCH. Change-Id: I5de747cc4436d21941329974cff3016970f497b8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Don't hard-code paths to /usr/X11R6 in linux-mkspecsTor Arne Vestbø2012-02-147-28/+28
| | | | | | | | | It was causing issues when cross-compiling with a sysroot, as the paths were not prefixed with the sysroot. The right include paths should be taken care of by pkgconfig anyways. Change-Id: I2cf7bf6377c88e6bf3b015100444d082530337ec Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix warnings about existing directories during cmake file creation.Stephen Kelly2012-02-111-9/+6
| | | | | | | Use the new QMAKE_SUBSTITUTES.config = vebatim feature. Change-Id: I4c08bd4694c11d48434eb225fc6902e69a4cdec2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add -fPIE to the Qt5Core_COMPILE_FLAGS with reduce-relocations.Stephen Kelly2012-02-101-0/+2
| | | | | | | | | | Qt requires this since 482d96a0c5d523ace63f56bda6851926b4469dd0 Change-Id: Iba783e283b17654abf46f11b81cc1641c3ce7d83 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix Harmattan compile target to be usable outside of ScratchboxSimon Hausmann2012-02-101-15/+1
| | | | | | | | | | Simply include the generic arm-gnueabi configuration. This should work from within and outside sbox, but at the same time keeping this mkspec allows us to enable Harmattan specific features such as the xinput2/touch support in the xcb back-end. Change-Id: I5cc0cdc3e222deb6374580392c3e3aadfc3a4bd9 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
* Force -fPIE on ELF if Qt is built with reduced relocationsOlivier Goffart2012-02-101-0/+2
| | | | | | | | | | | | | | | | Put in qconfig.h whether qt is compiled with reduced relocations. When using -Bsymbolic-functions (enabled by default on Qt) but not -fPIE, the comparison of the function pointers fail because the addresses are different in Qt, and in the executable. Hence we now enable -fPIE by default on qmake, and force a compilation error when it is not enabled and built with reduced relocations. Done-with: Sune Vuorela <sune@vuorela.dk> Change-Id: Ib3fdba06fab6e8a93b75b4c6cf16cc973ab335db Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add special casing for static modules.Stephen Kelly2012-02-071-5/+5
| | | | | | | | | QtUITools is a static library, so we need to mark that in its CMakeConfig.cmake file. Change-Id: I4e3684f7c62f4af28956a6e8f58edce7724f50dd Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Enable basic gesture support for WEC7.Miikka Heikkinen2012-02-062-2/+2
| | | | | | | | | | | | | This commit adds basic gesture support to WEC7 Qt builds, which enables developer to create custom gesture recognizers based on mouse events. Note that QTouchEvents are not yet generated in WEC7 Qt builds, so recognizers based on those cannot be created. Task-number: QTBUG-22517 Change-Id: Ic6218500b28b78ca8edec3edebd00d84c308a182 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* fix gdb_dwarf_index.prf for applications, take twoJoerg Bornemann2012-02-021-2/+3
| | | | | | | | | Handle the case of an empty DESTDIR. (cherry picked from commit 122fa6b53c33364a4687919191e55899acb43797) Change-Id: I0c2eec5736d0944b8ee97abdfa3f1121e7d8db4b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix gdb_dwarf_index.prf for executablesJoerg Bornemann2012-02-021-2/+9
| | | | | | | | | | | Unlike for libraries, $(TARGET) already contains $(DESTDIR). Changing to $(DESTDIR) does break the command in that case. Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 7eb770aed35fee50ff98c12e390dcb02c72b5132) Change-Id: Idd0f30d52db432062917a1c956c3af73e6c8a6a4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Windows: Fix inclusion of <windows.h>Friedemann Kleint2012-02-011-1/+0
| | | | | | | | | | | | | - Always use <qt_windows.h> as the last file to be included. - Remove it from some headers, use Qt::HANDLE instead of HANDLE. - Clean up #ifdef, use Q_OS_WIN for Windows/Windows CE. - Add NOMINMAX to qt_windows.h to avoid problems with the min/max macros. - Remove <windows.h> from qplatformdefs.h (VS2005) Change-Id: Ic44e2cb3eafce38e1ad645c3bf85745439398e50 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@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>
* Update contact address in license headers.Jason McDonald2012-01-311-1/+1
| | | | | Change-Id: I35bf916087511f26bfeb49ceb3256d9a20fbc1c0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-30120-120/+122
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I311e001373776812699d6efc045b5f742890c689 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* update readme to current realityOswald Buddenhagen2012-01-271-3/+3
| | | | | | Change-Id: I330702f197c8b558f0a00b90f5e147dbef731abd Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Add mkspecs for Blackberry Playbook NDKRafael Roquetto2012-01-266-0/+357
| | | | | | | mkspecs for QNX qcc, armv7le and x86 targets Change-Id: Ie4b0ec46a8837ad63f5aea8429cfdd516531e09a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add Native Client port mkspecs.Morten Johan Sorvig2012-01-258-0/+210
| | | | | | | Support cross-compiling for x86 and x86_64 nacl. Change-Id: I652702f9671b35963450c42dac5e27bedc698df0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove support for the MNG file format and the bundled libmngaavit2012-01-252-3/+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>
* mkspecs: Remove qtopia*.prf from the mkspecsHolger Hans Peter Freyther2012-01-244-7/+0
| | | | | | | | | | | | Qtopia was killed some time ago and these files do not have a direct use. Qt was embedded into the Qtopia sourcetree and it would be in the hands of the Qt Extended fork to move to Qt5 and update the buildsystem. It is unlikely that a Qt5 qmake will be used to build the Qt extended fork as a copy of Qt is embedded in the source tree. Change-Id: I2ef309c381aaf1d265ef385e85fd5c72d6205765 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* Move Clang mkspec for Mac OS X out of unsupportedTor Arne Vestbø2012-01-234-4/+4
| | | | | | | The plan is to make it the default mkspec for Qt 5 on Mac OS X. Change-Id: I49cf619a06fd7155dfbddc377558327b4be09cef Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Set macosx-version-min in common Mac OS X mkspec instead of configureTor Arne Vestbø2012-01-232-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | When set in configure it would be written to .qmake.cache and would only apply when building Qt. We then had an override (that was also out of sync, version-wise) in the g++ mkspec, which would also apply to apps building agains Qt. This override did howerver not apply when using the Clang mkspec. We now move setting macosx-version-min to the common macx mkspec, shared by both g++ and Clang, which will apply both when building Qt and when building something against Qt. The latter since an application built against Qt will not deploy on versions of Mac OS earlier than 10.6 anyways, so we might as well always set the minimum-version. The modifications to the mkspecs will result in macosx-version-min being passed twice when compiling qmake, as configure writes its own makefiles and the mkspec parsing in configure has a bug where it will lazily evaluate qmake-variables instead of evaluating them inline. This is not a problem, and can be fixed in a later patch if seen fit. Change-Id: Ib29503ad00a9dc00e0a50b0dbd9459e89a20dfbd Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Update contact information in license headers.Jason McDonald2012-01-23115-115/+115
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I431bbbf76d7c27d8b502f87947675c116994c415 Reviewed-by: Rohan McGovern <rohan.mcgovern@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>
* Added mkspecs for WEC7 platform builder and armv4i HW.Janne Anttila2012-01-136-0/+143
| | | | | | | Task-number: QTBUG-22496 Change-Id: I502e654de7e03fbdbd22b609698d238f90d129a9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix CONFIG+=declarative_debug if declarative is implicitly addedKai Koehne2012-01-121-1/+1
| | | | | | | | | | | | | Change 1fb5600c5eb2ee2af8a766dea5b325aee6dd43b4 already added declarative-debug as a way to include declarative, but nowadays there's also qquick, and qquick-private ... Just always set the define. The user has choosen to write CONFIG+=declarative_debug in the first place and an additional define if declarative isn't used does no harm. Change-Id: Ica6142e70b12950fc1d9e0bf7b94f747c843a17f Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Windows: Adapt cross mkspec for MinGW / gcc 4.6.Mark Brand2012-01-121-2/+2
| | | | | | | | | 4.6 becomes the minimum required version in Qt 5. This commit follows f6c61d13a3e166fc9280e8bfe8325cead335d0da. Change-Id: I151cd5ae63f076c4aa766bc5c9b9fb4d8fcd4f79 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Changed selftests unittest to work from installation directory.Kurt Korbatits2012-01-111-0/+25
| | | | | | | | | | - All subprograms installed as part of test instead of separate installs - Added installTestHelperApp() to testcase.prf Change-Id: I02fbbb299f095054c9216ad0e5f91f574fb0fe3d Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make modules find their own dependencies.Stephen Kelly2012-01-111-0/+12
| | | | | | Change-Id: I4a7b96d33417a15d79f3932ced91bee58915c83f Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* use "cp -R" instead of "cp -r" for *bsd compatibilityMark Brand2012-01-101-1/+1
| | | | | Change-Id: Ib013e2d36645a782249b543ec9301902484a7708 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update year in Nokia copyright headers.Jason McDonald2012-01-102-2/+2
| | | | | | | | The previous change missed some headers from years prior to 2011, and a few new files were merged after the previous change. Change-Id: Ib7d1a2b7062228c2a5373da64242b2ee1f0981e1 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove execute permission from files that don't need it.Jason McDonald2012-01-102-0/+0
| | | | | Change-Id: Ib92875289cdd9831f35301c566fb567acc725bb6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove qttest_p4.prf fileSergio Ahumada2012-01-061-13/+0
| | | | | | | | | | | | | | | | | qttest_p4.prf was added as a convenience for Qt's own autotests in Qt4. It enables various crufty undocumented magic, of dubious value. Stop using it, and explicitly enable the things from it which we want. Most autotest .pro files should look like this: CONFIG += testcase TARGET = tst_something QT = core testlib SOURCES = tst_something.cpp Change-Id: I051b230c5c4fd56dc6eae2b9b7bdff6c033248fd Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-05112-112/+112
| | | | | Change-Id: I02f2c620296fcd91d4967d58767ea33fc4e1e7dc Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix cmake files for static builds.Stephen Kelly2011-12-232-9/+30
| | | | | | Change-Id: I3864017df6fc0daeb31b389c8883401d344730bf Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Finish removing Qt3 supportBradley T. Hughes2011-12-231-1/+0
| | | | | | | | | | | | | | | | Remove the (-no)-qt3support options from configure, and remove the last remaining references to Qt3Support, QT3_SUPPORT, and QEvent::ChildInserted. The compatibilityChildInsertEvents() tests in tst_QObject and tst_QWidget have been renamed to childEvents(), which is a more appropriate name. Change-Id: Id0b45e9b177efcc8dceee8c9ed8afafedeeace2f Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Include the extras files after defining the target.Stephen Kelly2011-12-191-8/+8
| | | | | | | | Allows the extras file to contain references to the target. Change-Id: I47332c4efcb7ba0132509a41fa3040531cd1c81f Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add the .exe suffix to executables on Windows.Stephen Kelly2011-12-121-0/+1
| | | | | | Change-Id: I257bb7d62ae18ea529df6b10694fcf25eedc83f4 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add a wayland-scanner rule to qmakeJørgen Lind2011-12-123-0/+37
| | | | | Change-Id: I142ca2ba2a817745b818d2740d9ae8e0eaf3b797 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Set QMAKE_*_VERSION_OVERRIDE for all modules.Rohan McGovern2011-12-072-13/+11
| | | | | | | | | | | | | | | | | | | On Windows, qmake searches for and uses the highest numbered available version of each requested library, or a version with no number if no libraries were found. This meant that qmaking a library's consumer before qmaking the library itself could result in the consumer incorrectly attempting to link against $${LIB}.lib rather than the correct $${LIB}5.lib (for example). QMAKE_$${LIB}_VERSION_OVERRIDE is the way to work around this. Previously, a hardcoded list of libraries had version overrides set up on Windows, but the qmake order issue affects all libraries, not just these. Therefore, handle it for all modules. Change-Id: I83b4646e3819f525193d1fc065b0d0e65b3be99f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove the QT_THREAD_SUPPORT definesBradley T. Hughes2011-12-061-4/+0
| | | | | | | | | | These are no longer used. Qt 3.x used them to enable thread support (which was optional at the time), but starting with 4.0, thread support is always enabled, and these defines were removed from the code. Change-Id: I4d1c75171c263383fc055d2a7fe52ca0501acd7a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Use plural form for CMake variables.Stephen Kelly2011-12-061-2/+1
| | | | | Change-Id: Idc0cd360e09046a5746c9f7366c7fd4b982058fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 06:09:18 +0000