summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* mkspecs: Rename freebsd-g++40 to freebsd-g++46.Raphael Kubo da Costa2012-04-172-3/+3
| | | | | | | | | lang/gcc40 was removed from FreeBSD's ports tree in 2007, and the lang/gcc port, which provides a stable GCC version newer than the one in the base system, is currently pointing to the 4.6 series. Change-Id: Ifd959ef7b9cd122aa606644e97e337ace8742245 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* mkspecs: Sync freebsd-g++40 and freebsd-g++.Raphael Kubo da Costa2012-04-171-35/+6
| | | | | | | | Make freebsd-g++40 include gcc-base-unix.conf and g++-unix.conf and eliminate a lot of duplicate definitions. Change-Id: Ib3fe572ee276645fb03034a08fbc8e06720b6372 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Do not define QT_AOUT_UNDERSCORE in freebsd-g++'s mkspec.Raphael Kubo da Costa2012-04-171-11/+0
| | | | | | | | | | | According to FreeBSD svn r52802 from 1999 the -aout compiler option and the QT_AOUT_UNDERSCORE trick were already obsolete. Since the FreeBSD project itself only supports versions 7 and above these days, the definition can be safely removed. Change-Id: I324d5d5b136a6560d9e1b5c81b93efc32d87cdc2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove the freebsd-g++34 mkspec.Raphael Kubo da Costa2012-04-172-126/+0
| | | | | | | | | | | GCC 3.4 is older than the 4.2.1 in the base system, and should be removed from the ports tree. Besides, nobody in their sane mind would want to build Qt with such an old compiler. Change-Id: Ib40357758058505465a8bfcefbd182b9240591a5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Do not redefine QT_SOCKLEN_T in freebsd-g++'s mkspec.Raphael Kubo da Costa2012-04-171-9/+0
| | | | | | | | | | | | QT_SOCKLEN_T was being redefined depending on whether FreeBSD was < or >= 4, branched in early 1999. FreeBSD < 7 is not supported by the upstream project anymore, so we can simplify the code and rely on the QT_SOCKLEN_T definition in common/posix/qplatformdefs.h instead. Change-Id: I0e06fc37e29158932b95a2619a7442c6068a7d32 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-04-172-4/+2
|\ | | | | | | Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1
| * Merge remote-tracking branch 'origin/master' into api_changesLars Knoll2012-04-1616-34/+412
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/corelib/io/qurl.cpp src/gui/kernel/qwindow.cpp src/tools/moc/generator.cpp src/widgets/kernel/qwidget_qpa.cpp src/widgets/styles/qstyle.h src/widgets/widgets/qtabbar.cpp tests/auto/corelib/codecs/utf8/tst_utf8.cpp Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e
| * | Make plugin linking fail if some references aren't presentThiago Macieira2012-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's better to fail at linking time than to try and figure out later why QPluginLoader refuses to load the plugin. Change-Id: I439bad9dcdbfff9f76efe40381fd7ccfffe738bc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
| * | Merge remote-tracking branch 'origin/master' into api_changesOswald Buddenhagen2012-04-1017-23/+561
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/widgets/styles/qwindowsxpstyle.cpp tests/auto/gui/kernel/qwindow/qwindow.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3
| * \ \ Merge master into api_changesKent Hansen2012-03-278-2/+137
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qisenum.h src/dbus/qdbusconnection_p.h src/widgets/kernel/qwidget.cpp tests/auto/other/qaccessibility/tst_qaccessibility.cpp Change-Id: I85102515d5fec835832cc20ffdc5c1ba578bd01d
| * | | | Add detection of AVX and AVX2 support in the compiler.Thiago Macieira2012-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intel CC 12.1 supports AVX2 but only with -march=core-avx2. The -mavx2 option produces a warning. GCC 4.6 does not recognise any option. GCC 4.7 recognises both -mavx2 and -march=core-avx2 so let's use the latter for now. We may need to change to -mavx2 when there's an AMD processor that supports AVX2 too. Change-Id: I529240e6e6c2c0e3942d357e0320212d954fe4de Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | | | Remove detection for MMX support and related technologyThiago Macieira2012-03-231-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also removes the check for SSE, but the check for SSE2 and further technologies is kept. If SSE2 is present, then SSE is too. We don't have any code that uses the original SSE instructions only. Remove the CMOV detection, since we don't use that anywhere and we're not likely to ever use them.. Change-Id: I3faf2c555ad1c007c52a54644138902f716c1fe1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | Introduce fallback for general cross compilationDonald Carr2012-04-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current approach of forcing people to pass the fully qualified prefix of their toolchain to the configure script is verbose and something of a chore for people who use the same toolchain to target several devices. This allows you to set a single toolchain for use with all Qt targets via: qmake -set CROSS_COMPILE foo You can still explicitly override this toolchain, as originally mandated, with the configure time device-option arguments. Change-Id: Ibd3d940bb08fa09499533f9c661557e337a8421a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | Fix finding EGL on QNXThomas McGuire2012-04-161-0/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent change in platformsupport required "egl" to be defined, otherwise the QNX plugin would fail at runtime with unresolved symbols. Now the EGL config test passes. Change-Id: I111eb939abac86885bcdb35d5f5899f515bd8c4e Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 00:18:05 +0000