summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* directfb: Integrate building into configure.Holger Hans Peter Freyther2012-04-131-5/+3
| | | | | | | | | Add DirectFB buildsystem integration by adding a configure target and adding it as subdirectory to the project file. The default is to automatically build directfb. Update the Broadcom/9425 build. Change-Id: I482f865cebd9d5cd4c98c184773f8534f92db9df Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* device: Introduce hooks for the directfb plugin and use themHolger Hans Peter Freyther2012-04-132-0/+75
| | | | | | | | | The EGL integration is vendor specific, add platform hooks to the DirectFB plugin and implement them for the Broadcom 97425. The hook interface is internal and there are no ABI/API gurantees. Change-Id: I33359830c51f16895e771837fccb71e03c81cf18 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* device: Add device support for Trident's ShinerBhooshan Supe2012-04-122-0/+109
| | | | | | | | | Add mkspec for the Trident's Shiner platform to be used in conjunction with the -device support in configure. This allows you to build Qt Change-Id: I68d8e8eb78f073e98f72207e9c5de6a0da0ed35d Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* device: Add device support for STMicroelectronic's ST7108Bhooshan Supe2012-04-122-0/+78
| | | | | | | | | Add mkspec for the STMicroelectronic's ST7108 platform to be used in conjunction with the -device support in configure. This allows you to build Qt with the application libraries provided by STM SDK 35. Change-Id: I36aa174200f034ccd6ee285e3f8a8ffec99b3e70 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* device: Add device support for STMicroelectronic's ST7540Bhooshan Supe2012-04-122-0/+90
| | | | | | | | | Add mkspec for the STMicroelectronic's ST7540 platform to be used in conjunction with the -device support in configure. This allows you to build Qt with the application libraries provided by STM SDK 36. Change-Id: I4369b23b9a0c9063417e5cc71969f65e967e4019 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Change default value of QMAKE_LIBS_OPENGL_ES1 to libGLESv1_CMJason Barron2012-04-111-1/+1
| | | | | | | | | | | | The naming convention for these libraries says that libGLES_CM is to be used when EGL is included while libGLESv1_CM should be used when EGL is not included. Since we have a seperate variable for libEGL, it makes sense to have this variable represent the non-EGL version of the library. Change-Id: I9147c116da7be4a296a0ebeac39762b46725f10e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* eglfs: rework hooks designGirish Ramakrishnan2012-04-114-31/+36
| | | | | | | | | | | | | | | | | | | | There are two problems with the current design: 1. if (hooks) hooks->foo() doesn't work in debug mode when no platform hook is defined. The problem doesn't arise in release mode because the compiler optimizes away the if (hooks) into a no-op since hooks is NULL when no platform hook is defined. 2. Adding a new hook requires changing every platform's hook implementation. New approach: 1. Define QEglFSHooks as a class with virtual functions. A stub file provides the default implementation. 2. Platform hooks derive from above class and reimplement whatever is needed. The filenames and variables have been changed to be more in line with the Qt style. Change-Id: I2eaaa5ad7c8b48a06361c4747d4f210c428c983f Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Extend eglhooks to include hasCapabilityDonald Carr2012-04-112-0/+18
| | | | | | | | | Add BufferQueueingOpenGL to Raspberry PI's numerous capabilities Change-Id: I1197c28a0c82df3ae2f6d5360791010e17373555 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Moving stack-smashing protection to the Blackberry mkspecsSean Harmer2012-04-063-2/+7
| | | | | | | | | | It transpires that QNX 6.5.0 does not yet have libc support for the gcc stack smashing protection. Change-Id: Ic635662b6aa3ce2fad5f69e236386ae9ace420db Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* device: Add device support for the Broadcom Raspberry PIDonald Carr2012-04-043-0/+243
| | | | | | | | | | | | | | | | | | Add mkspec for the Raspberry PI platform to be used in conjunction with the -device support in configure. This allows you to build Qt with the application libraries provided by the Raspberry PI foundation. The Raspberry PI is described here: http://en.wikipedia.org/wiki/Raspberry_Pi and its use with Qt is documented here: http://wiki.qt-project.org/Devices/RaspberryPi Change-Id: Ib8d11d0a469edaaf34ccc04cf33a42a725fc2bdb Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* eglfs: Introduce hooks for the eglfs pluginGirish Ramakrishnan2012-04-042-0/+97
| | | | | | | | | | | | | | | | | EGL provides an api to create a rendering context for khronos APIs on native surfaces. The board initialization and window creation is platform specific. This commit adds platform hooks/extensions to the EGLFS plugin and implements them for the Amlogic 8726M. The hook interface is internal and there are no ABI/API guarantees. EGLFS is now linked with -Wl,-no-undefined to make sure that a hook does not add unresolvable symbols. Change-Id: I7f4fcdb422aacbf00de468f4d8e85ae5368bfacf Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Moved 'qnx' CONFIG definition to common location.Rafael Roquetto2012-04-042-1/+3
| | | | | | | | | Removed the duplicated 'qnx' CONFIG defition from the mkspecs and declared it on the common qcc-base-qnx.conf configuration file. Change-Id: Ie215e3dd794762f20bec9c19afd5936a78a9d963 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Enable stack smashing protection on QNX and Blackberry platformsSean Harmer2012-04-041-3/+6
| | | | | | | Change-Id: I2610c8e446a74ee584c5b450e1b872b7cda50813 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* device: Add device support for the Broadcom 97425 platformHolger Hans Peter Freyther2012-04-022-0/+107
| | | | | | | | | Add mkspec for the Broadcom 97425 platform using the new device.pri support. This allows to build Qt with the application libraries provided by Broadcom. Change-Id: Icad442be5da071e4f936e41236d4136234c5d16f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Rename the 'declarative debug support' to 'qml debug support'Kai Koehne2012-03-312-0/+2
| | | | | | | | | | | Since the library and almost everything got renamed to qml, we should do so for the debugging support, too. (CONFIG+=declarative_debug will continue to work for some time being, but prints a deprecated warning). Change-Id: I295155dce873e2585c1452d2bf0625ea6ce219c4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Overwrite the LIB_DEPENDENCIES of modules.Stephen Kelly2012-03-311-2/+2
| | | | | | | | | This way if a module is found more than once, the list does not grow duplicates. Change-Id: I08e3e2a83453f45a49fe79e803a4b50d115709a3 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Ensure that the variable for the installation prefix is unique.Stephen Kelly2012-03-311-6/+6
| | | | | | | | | Using the same variable for multiple config files can lead to conflicts. Change-Id: Ie6a22618c4c2e64567874e5c7e8b278e067fedae Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* device: Add device support for Amlogic 8726M boardGirish Ramakrishnan2012-03-302-0/+77
| | | | | | | | | | | | Add mkspec for the Amlogic 8726M platform using the -device support in configure. This allows to build Qt with the application libraries provided by Amlogic. The 8726M is an ARM Cortex-A9 that support NEON and has a Mali 400-M GPU. Change-Id: I01ea0c8e7d34dcb165653980a1856f6e22318c4d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
* device: Introduce a qmake test functionHolger Hans Peter Freyther2012-03-291-0/+11
| | | | | | | | | | A common issue for our users is that they do not provide the path to their cross compiler or don't have it in their $PATH. Introduce a qmake testFunction to sanity check the presence of the compiler. Change-Id: I7d41db139d2a9c67334908b96e9f5e8f996426f6 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't use the pri depends line for link dependencies.Stephen Kelly2012-03-281-4/+0
| | | | | | | | | That is not what depends is for. Change-Id: Iabf93e890f009bd6c8fcc18dde1891bf20a493f1 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Prefix the variables for debug and release types properly.Stephen Kelly2012-03-282-6/+6
| | | | | Change-Id: I346992effa997f60a4fd20055f0af81d6a084095 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Only create the cmake files if DESTDIR is non-empty.Stephen Kelly2012-03-281-1/+1
| | | | | | | This is the case for the winmain library. Change-Id: I8f416e81ad8de4a1fb2f70a4ebc31c8351c81605 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Disable ICC diagnostic 2261 about __assume with side-effectsThiago Macieira2012-03-271-1/+1
| | | | | | | | | | | | The warning is presented now that we use __assume in every Q_ASSERT. It presents itself in code that calls functions, like: tools/qbitarray.h(128): warning #2261: __assume expression with side effects discarded { Q_ASSERT(i >= 0 && i < size()); ^ Change-Id: I5851b3c35b56c00b9c541c2489233121ef621e04 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* device: Add -device and -device-option to configureGirish Ramakrishnan2012-03-271-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | For some reference platforms and SDKs we will need to pass in extra paths. Currently users have to modify the mkspec to adjust paths or set environment variables that will be picked up. This change introduces the -device <name> and -device-option <key=value> option. The key value pairs will be written to a qdevice.pri and can be used by the qmake.conf of the device spec. The reason to not save the key value pairs in qconfig.pri is becase of the fact that the device spec loads the qdevice.pri earlier than the qconfig.pri. qdevice.pri allows the mkspec to set the compiler flags and qconfig.pri allows configure to add to those compiler flags. Done-with: Holger Freyther Change-Id: I931a197b8be72397e1eedfee09502eefc01c9d4f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com>
* let qtPrepareTool give right path for app_bundleBai Jing2012-03-261-0/+6
| | | | | Change-Id: Ieb4979244d741c9d9d0c11a035c18ced87ea28f5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Blackberry mkspecsRafael Roquetto2012-03-264-0/+102
| | | | | | | | | | | | Unlike QNX mkspecs, these mkspecs target more specific, BlackBerry-only devices. So far, the only difference is the definition of Q_OS_BLACKBERRY and linking with -lbps, but this will likely change with time. It will also allow conditional compilation to distinguish between qnx and blackberry devices. Change-Id: Ia44e9b4059f720c308240e9dac7e90f7ae7920d0 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Only create cmake files if MODULE is set.Stephen Kelly2012-03-231-1/+1
| | | | | | | | WinMain does not set MODULE, though it uses qt_module_config and generates incomplete cmake files in the wrong locations as a result. Change-Id: I5081a13a19469ab8cd01970a55684b8451bc79d7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update the Linux-ICC mkspecThiago Macieira2012-03-221-9/+1
| | | | | | | | | | | Include linux.conf instead of unix.conf, so it can compile Qt Base these days (otherwise, we get an error from wayland-scanner.prf). Remove the outdated information from the header. The mkspec now matches ICC 12, not 10 and there are more diagnostics we disable. Change-Id: Ic75593759a4d53f859a9a9e919d77b5c52d01024 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Changed installTestHelperApp() to use relative paths to buildKurt Korbatits2012-03-221-1/+1
| | | | | | | | - Changed installTestHelperApp() to use OUT_PWD path to find files. (was looking in source tree instead of build) Change-Id: If795c17a76aebcfbbe0d4f84c5df784a255ddb19 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove QT += uilib from designer.prfBradley T. Hughes2012-03-201-1/+1
| | | | | | | No Qt module named uilib exists. Change-Id: Icb5916c27440257696e5103f0d61dc05e4d7bb9f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Include generic ARM qplatformdefs.h in linux-g++-maemo mkspecGareth Stockwell2012-03-191-1/+1
| | | | | | | | qmake.conf already includes the linux-arm-gnueabi-g++ configuration; this patch does the same for the platformdefs.h header. Change-Id: I14ee4e406e8c00ae1a57140676f60d030daba18f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Silence warnings about va_list mangling for QNX toolchainSean Harmer2012-03-191-1/+1
| | | | | | | | Change-Id: I12d8d534c3c5d93e95a03d7b3705f3722501de7d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Install fonts when not using fontconfigGirish Ramakrishnan2012-03-162-6/+5
| | | | | | | | | | | When built without fontconfig support, the basic unix font database relies on fonts installed in libs/fonts to populate the database. Change-Id: Id1e54c5b032095470049210bb831cfe4c79b3569 Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* 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>
* Use the LSB linker to linkHarald Fernengel2012-03-151-0/+8
| | | | | | | | | | | Fixes those cases where things would magically link, although they were everything but LSB compliant. Also fix a linker error, it seems we need to explicitly link to -lrt, otherwise, the non-LSB compliant system lib will be taken into account. Change-Id: I40e278f1c4d2e02084c4c5f15b9bbff8c5901d32 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix the QMAKE_LIBS_WAYLAND variableJørgen Lind2012-03-121-1/+2
| | | | | | | | | | This variable is there for documentation, but its not being used anymore. There are two libraries from wayland, libwayland-client and libwayland-server. Add two variables that will be picked up in the QtWayland module. Change-Id: I16219092a4ed2e48080921ce39f61192b6abb711 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Do not add -rpath-link directives with no library pathSean Harmer2012-03-121-3/+5
| | | | | | | | Doing so works fine on Linux as g++ version there silently ignores this. However, the qcc toolchain for QNX barfs. Change-Id: Ia236910adc09dc1653e4169e20476b69c2de62ab Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* sanitize install target namesOswald Buddenhagen2012-03-121-1/+5
| | | | | | | | qmake uses the variable name verbatim, which makes the generated makefile look "interesting" without this cleanup. Change-Id: If6c4f12563a0ee6429513fbfac534f40bb7c0b97 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QT_RAW_INSTALL_FOO => QT_INSTALL_FOO/rawOswald Buddenhagen2012-03-121-8/+8
| | | | | | | | | | | | this makes the "sysrootable" properties more magic, with the raw versions being omitted from the qmake -query output and automatically falling back to the "cooked" variant if there is no sysroot set. this makes the "normal" qmake -query less noisy. this will become even more obvious when i add more "overloads" of the properties. Change-Id: I08000986427264ec6238c8fe0a77f5cecdbf1201 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Update qnx mkspecs to not use fixed tool pathsSean Harmer2012-03-121-3/+0
| | | | | | | | | This changeset allows Qt to be built for QNX platforms in light of commit d59e85d9095f5d8fa787149fe8d34e8dfac0a0b5. Change-Id: Idf8e89cf1b0a5625ef7ee6397c223137fa151cdc Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* another attempt at solving the popping up of .qmake.cache problemOswald Buddenhagen2012-03-091-1/+1
| | | | | | | | | syncqt may generate that file also as a result of configure tests. so just check for the file's existence instead of trying to reproduce under which circumstances it should appear. Change-Id: Ia24f96b05fc70e104f7be19d08cea614ffb505be Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* remove assignment of QMAKE_MOC & QMAKE_UIC from mkspecs (part 2)Mark Brand2012-03-0913-52/+0
| | | | | | | | | | Follow-up to d13bedb9d8fb66f58ba901864555bcc9b6e463e0 where the regexp was a bit too tight and missed many specs. Also cleaned up QMAKE_IDC, QMAKE_RCC and QMAKE_IDL. Change-Id: Ia15007141739019ef5ccfdda0c856c478f732b85 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* replace uses of QMAKE_INCDIR_QT and QMAKE_LIBDIR_QT with module-specific ↵Oswald Buddenhagen2012-03-082-2/+2
| | | | | | | variables Change-Id: Id410887fa97f345a229e0cbf395633ccf303fa2f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove automatic building of moc from moc.prfOswald Buddenhagen2012-03-081-6/+0
| | | | | | | | the problem this (probably) tried to solve has been solved via ordered builds a *long* time ago. Change-Id: I84c58076c864735eea4210ec60aa060fe3e5d97e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* delete dumpcpp.prfOswald Buddenhagen2012-03-081-11/+0
| | | | | | | | it seems to be a no-op. presumably it was meant to be an auto-rebuild hack like in moc.prf, but it wasn't really "wired". Change-Id: I914456f5f5a63a06c2004b16edcf2e2ade448270 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Renaming QNX mkspecsRafael Roquetto2012-03-076-3/+3
| | | | | | | | Renamed from blackberry-* to qnx-* in order to match he <platform>-<compiler> pattern. Change-Id: I378151f3d564dd280943c74865a1d2b97215b656 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Query udev build parameters from pkg-configDonald Carr2012-03-071-0/+1
| | | | | | | | Change-Id: Ia3b7329d7359684ee7bf572a7e5fb681105108f4 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Holger Freyther <holger+qt@freyther.de> Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* List the dependencies of Qt when creating static libraries.Stephen Kelly2012-03-051-2/+53
| | | | | | Change-Id: Ib6787f982ff962cfdf3d8a0a26989489619a57b0 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 17:29:39 +0000