summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Introduce a Snowball mkspec to the device specsDonald Carr2012-05-252-0/+75
| | | | | Change-Id: I7aa2f1a719c424079d7f0d7b3410f293cee05fa9 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* -device: remove redundant check for empty CROSS_COMPILEGirish Ramakrishnan2012-05-242-3/+0
| | | | | | | | | | Remove the check from ST7540 and PNX8473 specs since it's already checked in deviceSanityCheckCompiler Change-Id: I2accb12f9e692e253f76194ca68b1f4cc673a833 Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* bcm97425: Fix linking the directfbegl QPA pluginHolger Hans Peter Freyther2012-05-241-1/+2
| | | | | | | | | | directfbegl requires libQtPlatformSupport to provide some EGL helper functions. Enable EGL by adding it to the QT_CONFIG variable in the qmake.conf. Change-Id: I80d3163d9da4b9eb232aea72ba7d4388453f8247 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Enable extra warnings for win32-g++ mkspecsJonathan Liu2012-05-232-2/+2
| | | | | | Change-Id: I09d6ed18007f29bad84e757f2916c6f7323e5b44 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* devices: Allow to pick up the compiler from the pathHolger Hans Peter Freyther2012-05-231-2/+7
| | | | | | | | | | | Re-enable checking if the compiler is in the path. The previous commit dealt with a user/spec author not setting CROSS_COMPILE and then picking up the host g++. Re-add the 'which' check, but put it after the sanity check for the CROSS_COMPILE variable. This check assumes that QMAKE_CXX is of the form "${CROSS_COMPILE}g++". Change-Id: I54f7e058a75d26d73eca5a860946a6854ce91d67 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* device: Check CROSS_COMPILE in deviceSanityCheckCompilerGirish Ramakrishnan2012-05-231-4/+6
| | | | | | | | | | | | QMAKE_CXX is initialized by default to gcc. As a result, 'which $QMAKE_CXX' always succeeds. This change removes the 'which' check and makes it explicit that CROSS_COMPILE is a mandatory option to -device mkspecs. Change-Id: Icefa9d14fc24086a60c9108ff7d9d16fd9990995 Done-with: Johannes Zellner Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* eglfs/pi: update handles are 'local' variablesGirish Ramakrishnan2012-05-221-2/+3
| | | | | | Change-Id: Iec687e9cd015ed389a637b50e4e4e332478b6e1f Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* Clean up Raspberry Pi specDonald Carr2012-05-221-9/+18
| | | | | | | Introduce platform libs hook to handle/allow device specific initialization and the associated symbol resolution Change-Id: I098b07dcb581390d369d9165c6cedc7ace1e088a Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* win32/default_pre.prf: Remove exceptions_off, thread_off, stl_off.Friedemann Kleint2012-05-211-1/+1
| | | | | | | | | | | | - thread_off, stl_off are obsolete. - exceptions_off causes exceptions to be globally disabled for applications using MinGW after 2b21dd69d6a4e47f0ec3d3958ab1def0983ce76c. Change-Id: Ia109c5806f2a0172efed5680a55ca53a2846d778 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove optimization flag from QMAKE_CFLAGSRomain Pokrzywka2012-05-174-6/+3
| | | | | | | | | -O2 is already the default optimization level for release builds, as defined in gcc-base.conf. In addition, it shouldn't be set for debug builds. Change-Id: Idd7406b0d135d9579676b389050fd6e5776e722c Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Apply compiler platform flags to debug builds as wellRomain Pokrzywka2012-05-174-8/+8
| | | | | | | | | Compiler flags like CPU architecture and FPU should be set on QMAKE_CFLAGS instead of QMAKE_CFLAGS_RELEASE, as the latter only applies to release builds Change-Id: I2e729a9e413934e904fc2810394e118940b8557f Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* turn off exceptions by default where they aren't requiredLars Knoll2012-05-177-3/+15
| | | | | | | | | | | | | This significantly reduces the size of the generated code in places where we don't need exceptions. The -(no-)exceptions configure flag has been removed in the process, as there is now a fine grained way to control this on a per module level, and Qt is being compiled without exceptions in most places. Change-Id: I99a15c5d03339db1fbffd4987935d0d671cdbc32 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add Visual Studio 11 mkspecAndreas Holzammer2012-05-162-0/+135
| | | | | | | | | | | This adds the Visual Studio 11 mkspec and the corresponding changes to configure and qmake makesystem. Change-Id: I3a7e82a6f7f90aa0a94dedd493ebaa66bf100923 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Properly quote all variables which are paths.Stephen Kelly2012-05-161-2/+2
| | | | | | | | This is required if Qt is installed into a directory with spaces. Change-Id: I1d6874265558d712ac98a3aef670c2934a632ab1 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Use IF(NOT TARGET ...) before creating imported targets.Stephen Kelly2012-05-151-3/+1
| | | | | | | | | | | | | | | | | | Initially we didn't do this because someone could accidentally create another target of a conflicting name, and used a variable to store whether we have created the target already or not. That wasn't adequeate to deal with finding the package in a scope like a function, so we used a directory property. However, the directory property is not valid in the same scopes as the defined target. For example, finding a Qt module in both a directory and a subdirectory causes a conflict. As it is already unlikely that a target would be accidentally created with a name like Qt5::Core, we should simply use the IF(TARGET) form. Change-Id: If64f25d45f51edcd1edb0d4bfb5ed3bb2479bd27 Reviewed-by: David Faure <faure@kde.org>
* Set QMAKE_DOCS_INSTALLDIR to $$[QT_INSTALL_DOCS] to allow overriding in .proMarius Storm-Olsen2012-05-152-1/+6
| | | | | | | | | | | | Normally you want to pass -installdir $$[QT_INSTALL_DOCS] to qdoc by default. However, if you want to force the generation of URL links to the documentation, the option cannot be specified. By setting the QMAKE_DOCS_INSTALLDIR variable in default_pre.prf a project may override it at will, as for example Qt Creator would do. Change-Id: Ib31f03acf4e8050cf2dd3aa33f3a10ed027f1df7 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* device: don't set a default cross compile prefixDonald Carr2012-05-157-15/+2
| | | | | | | | | | | | | | qmake -set can be used instead to set a the default cross compile. device_config.prf already contains code to read this default. Remove per-spec CROSS_COMPILE checks Introduce deviceSanityCheckCompiler() usage where appropriate Done-with: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Change-Id: I07c75c9e933dc1174a1bf8bf523b6b4a6b427408 Reviewed-by: Romain Pokrzywka <romain.pokrzywka@kdab.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Use directory property instead of variable to determine target existance.Stephen Kelly2012-05-141-2/+3
| | | | | | | | | This is more resilient to calling find_package in a scope such as a function. Change-Id: I17e69a416f4aed3102fa6195d239bcf4ce0b306b Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Only find dependencies from the same Qt installation.Stephen Kelly2012-05-131-1/+5
| | | | | | | | | | | | Add a PATH to search for dependencies in the current prefix, and disable other CMake searching logic with NO_DEFAULT_PATH. A Qt installation must all be installed to the same prefix currently. If that constraint is ever relaxed, we can turn this into a hint instead. Change-Id: I633cafb7e546dbd102ac0b2ed18db260d26adc51 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove stale udev checkDonald Carr2012-05-121-6/+0
| | | | | | | udev headers now ship as part of the base debian reference image Change-Id: I181c7f48ca59af46fccf8f3204845379d068c023 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* configure: Remove the -dwarf2 argument for Mac OS X buildsBradley T. Hughes2012-05-115-14/+7
| | | | | | | | | | Modern versions of Xcode properly support dwarf2, and as such dwarf2 is always enabled. This change removes the ability to turn it off, making dwarf2 non-optional. Change-Id: I149daeae6048ee8a1ed116363572173ad219102e Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove declarative from qmltestcase.prf.Friedemann Kleint2012-05-111-1/+1
| | | | | | Change-Id: Ia4bf45132a74ec7bbbb2a918088c176f87a26e76 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add underscore to internal implementation detail variables.Stephen Kelly2012-05-101-11/+11
| | | | | | Change-Id: I4c70ed2808396931fff986fbfad5940dd39e74f6 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Include the VERSION_STRING in CMake config files.Stephen Kelly2012-05-101-0/+1
| | | | | | Change-Id: I9f0e9316241b4cb615350876b11ee263f7efd3bf Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Merge branch 'docs-refactoring' into masterMarius Storm-Olsen2012-05-101-0/+27
|\ | | | | | | Change-Id: Iebd1966abace3cdf7f9428dcfc1ded5b124ab113
| * Properly implement a 'make docs' target for subdirs and apps/libsMarius Storm-Olsen2012-05-091-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only call qdoc for projects which sets the QMAKE_DOCS variable to point to a qdocconf file. Exclude examples/ and tests/ from the qdoc run, by adding no_docs_target to CONFIG for those projects. Change-Id: Ic856c8f19db59309302d0602b3e99735609e525a Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | Fix qpa files installationGirish Ramakrishnan2012-05-081-0/+4
| | | | | | | | | | | | | | qpa header files were not installed under qpa/. Change-Id: I243c3a7e83a342f7485791a1a29b65c9a8f25d6b Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | Don't attempt to ask cmake to find the glib dependencies.Stephen Kelly2012-05-081-2/+5
|/ | | | | | | | Those components are not known to FindGTK2.cmake. Change-Id: I4a7fe35d7d118168c24285f3ea8f57822b2facff Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Introduce Arch Linux specific link line to pi mkspecDonald Carr2012-05-051-1/+6
| | | | | Change-Id: I77c99a2f5e25c28ad2d4a13e3b56d3603cd5bb64 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Add mkspecs for 32-bit Mac OS X builds.Morten Johan Sorvig2012-05-0410-5/+215
| | | | | | | | | | | | | | | | Add mkspecs/macx-clang-32 Add mkspecs/macx-g++-32 Add mkspecs/common/clang-mac.conf Skip the rest of the Mac mkspecs (icc, llvm, g++40, g++42, builder, Xcode, xlc) pending a cleanup where we determine which ones to keep. Change-Id: I00ceddfcbdb5119cb132433bad43e4aed016eab2 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Remove all usages of "arch" CFLAGS on Mac.Morten Johan Sorvig2012-05-048-63/+0
| | | | | | | | | | | | | Remove all [PPC|PPC64|X86|x86_64] CFLAGS, CXXFLAGS and OBJECTIVE_CFLAGS. Delete the arch prf files. 32/64 bit arch selection will be made using a different mechanism in Qt 5. Universal builds are not supported. Change-Id: I4664f2c31801cec7fb4d240f41c2c5204a109020 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Revert "Don't use the pri depends line for link dependencies."Stephen Kelly2012-05-031-0/+4
| | | | | | | | | | | | | This reverts commit df43b9a06a73759ba74f23d9c3e91bd0347d1026. Using the same depends information as QMake provides adds a lot of convenience for users, and is mostly 'correct' from a CMake point of view anyway. Change-Id: I8f2a2f74a687c25a0dedcc491ef72ddb5b136090 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* mkspecs: Define compilers and linkers elsewhere for freebsd-g++46.Raphael Kubo da Costa2012-05-031-4/+10
| | | | | | | | | | | | | Commit 996672933a61016fdc0ec6d42d536986c5080ac5 has made the freebsd-g++46 mkspec use g++-base.conf, which on its turn resets QMAKE_CC and QMAKE_CXX to other values. Redefine them to gcc46 and g++46, respectively (and fix the linker values) after the inclusion of g++-unix.conf so the settings are not lost. Change-Id: I2d03548fdc492c5e4c4744b636b29df2cefe2acd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Enable QML debugging of qtquick1 with CONFIG+=quick1Kai Koehne2012-05-022-1/+2
| | | | | | | | Make the option name align with the name of the module. Change-Id: I29a822b55b3cb52a51592aa2bd0746a53bfe44b9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Make eglfs hooks functionality namespace cognisantDonald Carr2012-05-023-0/+10
| | | | | Change-Id: Ie9f86bd0494c0423f50d0f405922ab169b2431e3 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* If a dependency was not found, and we were not called with REQUIRED, we are ↵Stephen Kelly2012-04-291-0/+6
| | | | | | | | | | not found. This only works with CMake 2.8.8, but it is no harm to earlier versions. Change-Id: I62c220e4b24f951e83c23eb57d5f833de4d181c5 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Properly quote the dependencies string.Stephen Kelly2012-04-291-1/+1
| | | | | | Change-Id: I319b04cdb21860652658ee8d3e577d41a913ed5a Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Make sure different modules do not overwrite each others dependencies.Stephen Kelly2012-04-291-2/+2
| | | | | | Change-Id: I30ca05d3c692a707cfe829ad5fee099549bab540 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Forward the REQUIRED and QUIET arguments when finding dependencies.Stephen Kelly2012-04-291-1/+10
| | | | | | Change-Id: I5d7c26f12a296ac3527575149978b18c5e9a4a67 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Added mkspecs for iOS.Qt4iOS2012-04-2636-0/+1532
| | | | | | | | | | Modified common MacOS gcc config for iOS compatibility. Added iOS mkspecs for iOS devices and simulator using G++, LLVM-G++ or CLANG compilers. Change-Id: If0a0b1a3ce4e0dc4db319a315e227a9d31549399 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add makespecs for standard devices in the OMAP3 familyRomain Pokrzywka2012-04-254-0/+206
| | | | | | | | | | | | | | The beagleboard and Archos gen8 tablets are built on the same hardware and OpenEmbedded platform build system. The makespecs enable OpenGL/ES2 support and EGLFS as the default platform. Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com> Change-Id: I04938676f82f9136efd662ff3ede16221eadf275 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Warn if we use deprecated methods from Qt modulesThiago Macieira2012-04-251-0/+1
| | | | | | | | | | | This change will cause any use of methods and classes declared with Q_DECL_DEPRECATED to produce a warning in the compilation output. Those warnings need to be silenced before the Qt 5.0 release, preferably before the beta. Change-Id: I28ce133867cc5918e177c57f6e5f7ab9421989ad Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix creation of config files in debug mode.Stephen Kelly2012-04-241-2/+16
| | | | | | | f88212c22f7e4bec261130a6f82294adfc75abca was not complete. Change-Id: Ie5b1bb4832176ec8a72ace473f7dbc6c4de10ff2 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Add N9 device mkspec to device mkspecs folderDonald Carr2012-04-242-0/+76
| | | | | Change-Id: Ie8b0e8a014316b218c86cfdc0c58cad1ae4d3015 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Revert "Add workaround for projects using 'QT += declarative'"Friedemann Kleint2012-04-231-27/+0
| | | | | | | | | | | | | The workaround should no longer be necessary. It causes compile errors for MinGW since the command lines are too long. This reverts commit 6225e3ba01ef918724a15dd1311ab5d8205be534. Change-Id: I0288f4621f072b91dc94f25092ef124fa4c1b09e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Set default Lighthouse plugin for QNXAndreas Holzammer2012-04-231-0/+3
| | | | | | | Change-Id: Id1e51fcd3ce795b2c408d0376679597f6da5c33a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Don't tell CMake we're making debug libraries if we're not.Stephen Kelly2012-04-231-2/+2
| | | | | | | | | | | | The config option debug_and_release is set on Windows and on mac (unless xcode is used independently of whether Qt is configured with -release or not.) We need to check CONFIG(release,debug|release) to see if -release was set. Change-Id: Ibf952958874f6b102981526b3397e848c207a3f2 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Make the QNX QPA plugin work with non blackberry.Stephen Kelly2012-04-236-43/+57
| | | | | | | | Change-Id: Id85d18d9f21711e8d53e8e4bfdf39d10e135f593 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Adjust device mkspecs to use qpa default plugin varDonald Carr2012-04-207-2/+12
| | | | | Change-Id: If7be3517a423324e744805e8508eb9277a600ed4 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* fix undefined behavior issue on IntegrityKonstantin Ritt2012-04-191-0/+4
| | | | | | | | in contrast to ::strdup(), qstrdup() allocates memory via new[]; deallocating this memory with free() leads to undefine behavior. Change-Id: I0692c4bef010c05de547283b00b6c6043ac24c79 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 11:34:33 +0000