summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* fix QT_GCC_*_VERSION definition after exception option removalOswald Buddenhagen2012-05-251-2/+2
| | | | | | | | | sometimes it pays off to actually check where variables are used ... Change-Id: Ia91c89cb963ace50f432c54ffe5f57366ccd5603 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Allow a space between "-l" and library name when configuringkb2012-05-231-2/+7
| | | | | | | | Qt's configure allows for spaces between an option and its argument. This patch brings -l in line with -L et al. Change-Id: Iea5c78dc06f69c21b7419fd9fa73c52ae1cea18f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* -device: c01621ec8 broke device featureGirish Ramakrishnan2012-05-191-0/+2
| | | | | | | result was never returned by resolveDeviceMkspec Change-Id: Ibd2f647e5524cdc9dbf4ea06f7b815f9dcc43212 Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* device: Allow specifying shortnames for device mkspecsGirish Ramakrishnan2012-05-191-1/+17
| | | | | | | | | Specifying -device linux-amlogic-8726M-g++ is error prone. With this change, one can specify any substring of the mkspec names under devices/ and the first one will be picked. Change-Id: I7c4522fdaefe4a11e9292f7831075aa766a62c0b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Blacklist Apple clang 3.0 and previous support for AVXThiago Macieira2012-05-181-1/+22
| | | | | | | | | | | | | | | | | | | | In at least one case found in our testfarm, the compiler runs into an ICE (Internal Compiler Error) compiling the new AVX code. The error it reported was: fatal error: error in backend: Cannot select: 0x7fbf1aa42210: f64 = sint_to_fp 0x7fbf1aa88a10 [ORD=1936] [ID=37] 0x7fbf1aa88a10: i32,ch = CopyFromReg 0x7fbf19538768, 0x7fbf1a9f2610 [ORD=1936] [ID=27] 0x7fbf1a9f2610: i32 = Register %vreg38 [ORD=1936] [ID=9] As is the nature of ICEs, juggling the code around will probably make it pass. But since I have plenty more AVX changes pending, which make the code even more complex, it's also very likely that this issue will happen in other places. For that reason, I choose to blacklist the compiler instead. Change-Id: Ide3201f0cc49c7ceb63e966f6de65a8315cbea4b Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* turn off exceptions by default where they aren't requiredLars Knoll2012-05-171-90/+2
| | | | | | | | | | | | | 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>
* configure: save pkg-config env in qconfig.priJohannes Zellner2012-05-141-0/+8
| | | | | | | | | | Store PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_LIBDIR for the usecase of cross compilation in qconfig.pri. They will get picked up by pkgConfigExecutable() in qt_functions.prf used from link_pkgconfig.prf as environment for pkg-config calls. Change-Id: I7d0de05c0bd21b435275fc26c66a80035ba30970 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* configure: Remove the -dwarf2 argument for Mac OS X buildsBradley T. Hughes2012-05-111-26/+1
| | | | | | | | | | 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 "file qmake"-based arch detection.Morten Johan Sorvig2012-05-041-24/+0
| | | | | | | Change-Id: I0b6b66eb439c7f0f566b74cc3da0726a5ecbac34 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>
* configure: Escape '{' in getQMakeConf2 functionSergio Ahumada2012-05-011-1/+1
| | | | | Change-Id: I7df0ca940a76b80d7b0da24dbedbabd2b8736bb8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make QGtkStyle work on Qt 5.Morten Johan Sorvig2012-04-301-0/+26
| | | | | | | | Mostly straightforward porting: Add configure test from Qt 4. Add X11 include to qgtkstyle_p.cpp. Use renamed QGuiApplicationPrivate::showModalWindow. Change-Id: I83020e13ec00b49f3fe346814f881bce19a6f602 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix detection of default platform plugin.Girish Ramakrishnan2012-04-191-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let configure generate the QT_QPA_DEFAULT_PLATFORM_NAME in qconfig.h. This allows us to override the platform name using a configure argument. This commit adds -qpa <platform> that lets the user specify the default platform at configure time. Note that the default platform is not checked against the tree since plugins are allowed to exist outside the Qt source tree. In the absence of -qpa argument, configure checks the mkspec for a variable named QT_QPA_DEFAULT_PLATFORM. This check is implemented only in the unix configure because it will be primarily used in custom mkspecs (devices, boards). If -qpa argument is absent and the mkspec variable is absent, the default value is determined based on the OS as below: Unix - "xcb" Windows - "windows" Mac - "cocoa" QNX - "qnx" Done-with: Jørgen Lind Change-Id: I0df31811a1b901a3242bfada1232e596ebda04f4 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* -device: create qdevice.pri only when build tree is initializedGirish Ramakrishnan2012-04-191-9/+9
| | | | | | | | | | | | The build tree is not initialized when -help is passed to configure. The mkspecs/ directory is not created and thus the mv fails results with the following error: mv: cannot move `.device.vars' to `/tmp/qtbase/mkspecs/qdevice.pri': No such file or directory The solution is to create qdevice.pri just before we run config.tests. Change-Id: Ie83018e27a03bb840d213aae8c963b0074e62bb4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't fail to configure if QNX platform plugin is built.Stephen Kelly2012-04-191-1/+2
| | | | | | | Change-Id: I781eab2fb07fe62d733317b8a72dd899caaf5a80 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add a functionality test for DirectFB to ensure it compiles.Thiago Macieira2012-04-191-2/+13
| | | | | | | | | | | | | | | | | | | | | Some versions of the DirectFB headers are unclean and will cause Qt compilation failures. So blacklist those versions. Version 1.5.3 (present in Fedora 16) is known to be buggy and gets disabled by this patch. The compile error was: qurlquery.h:169:5: error: ‘typeof’ was not declared in this scope (qplatformcursor_qpa.h includes qevent.h which includes qurl.h which includes that) The error comes from the Q_FOREACH expansion. Note that Q_FOREACH uses __typeof__, so it's supposed to be safe, unless someone ill-advised goes and defines the GCC "safe" macro (double underscores on both sides) to something else. Change-Id: Ida41ee3b3c2fcba86a7e12182e7055123166693b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* configure: fix script error with -helpGirish Ramakrishnan2012-04-191-1/+1
| | | | | | | | configure -help results in the following error: [: 3174: missing ] Change-Id: Ibe7a5292087924d3efd0c87d9fb91deee831171f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-04-171-109/+31
|\ | | | | | | Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1
| * Merge remote-tracking branch 'origin/master' into api_changesLars Knoll2012-04-161-56/+135
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ Merge remote-tracking branch 'origin/master' into api_changesOswald Buddenhagen2012-04-101-1076/+407
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Remove the -no-stl option from configureThiago Macieira2012-03-281-47/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was decided on the mailing list. See: http://lists.qt-project.org/pipermail/development/2012-March/002442.html http://lists.qt-project.org/pipermail/development/2012-March/002465.html Change-Id: I7681e5cc743b20f6d4e29d2aea45c50df41a0b98 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | | Merge master into api_changesKent Hansen2012-03-271-13/+44
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-60/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Merge master into api_changesKent Hansen2012-03-231-102/+157
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1
| * | | | | Fix cross-compilation of qdbus bootstrapped tools.Stephen Kelly2012-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib40fc1c1743ff23a259cabbf26d91956398c3239 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* | | | | | Remove incorrect inclusion of GL support headers given EGL presenceDonald Carr2012-04-161-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The include files have a hard dependency on OpenGL (ES2); testing for the presence of EGL support is insufficient grounds for including this functionality Change-Id: I391b5dbbcbef40ecf68d16617b6eb1c0bb4b799e Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | | Fixed configure output when no platform plugin is enabled.Samuel Rødal2012-04-161-2/+2
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having to pass -no-xcb -no-eglfs -no-directfb, it's better to pass -no-qpa-platform-guard which is also resilient against future platform additions. Change-Id: Id68bfe3688980fa273665b01b9332f5d6f359491 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com>
* | | | | directfb: Integrate building into configure.Holger Hans Peter Freyther2012-04-131-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Use Clang by default on Mac OS 10.8 and above.Morten Sorvig2012-04-121-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieaf65a86f2a0ccc5dac007030ea345ce6ccc7185 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* | | | | configure: add -pkg-config option to control pkg-config usageGirish Ramakrishnan2012-04-111-46/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, for host builds, pkg-config usage is autodetected based on it's availability in the mkspec or the PATH. For xcompile builds, pkg-config is disabled unless -force-pkg-config is passed. -force-pkg-config is poorly named since it doesn't reflect the fact that it applies only to xplatform builds. It is in fact the only way to enable pkg-config in xcompile builds. And when passed, it doesn't actually force anything since all it does is check env variables. To add to the confusion, it prints a warning even if the env variables are setup correctly. This patch remedies the situation. It adds (-no)-pkg-config. The flag works for both host and xcompile builds. By default, the value is 'auto'. In this mode, it will try try to detect pkg-config from the path. If found, it will be used. For xcompiled builds, we use some heuristics to determine if the pkg-config is actually usable: 1. if -sysroot is not set and the environment variables PKG_CONFIG_LIBDIR or PKG_CONFIG_SYSROOT_DIR are not set, we disable pkg-config. 2. if -sysroot is set, then we setup PKG_CONFIG_LIBDIR and PKG_CONFIG_SYSROOT_DIR automatically (provided $SYSROOT/usr/lib/pkgconfig exists). If the value is 'yes', configure will error if it's heuristics fail to detect a usable pkg-config. If the value is 'no', pkg-config usage is disabled. If the value is 'force', configure will skip it's heuristics and use pkg-config anyway. This mode is useful, for example, when compiling for 32-bit on 64-bit systems. This change also removes references to PKG_CONFIG_SYSROOT (PKG_CONFIG_SYSROOT_DIR is the correct environment variable). Change-Id: I07fc8d48603c65a60de0336fc6276e90fcb41430 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | Save configuration feedback into config.summaryGirish Ramakrishnan2012-04-101-0/+5
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Scrolling the configure output to locate the build configuration is painful. So save it in config.summary. Change-Id: I40a2f7628e9a2b91a8ea44619dd49c00d5a61561 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Don't suppress using separate debug info when cross compilingDonald Carr2012-04-031-18/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The configure script currently automatically assumes that if you are cross compiling, we should avoid trying to generate and strip separate debug information due to toolchain limitations. Historically there may have been good grounds for this, but it seems like an aggressively pessimistic assumption which ignores the standardization/advancement of embedded toolchains as a whole. This assumption also extends to host compilers which deviate from the automatically detected "platform" compiler, such as Clang. Change-Id: Ifed2750325178bb5291d8ca1dde92925bfa36065 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Rename the 'declarative debug support' to 'qml debug support'Kai Koehne2012-03-311-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Remove sysroot detectionGirish Ramakrishnan2012-03-281-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure parses the compiler from the mkspecs using an awk script. The detected compiler is then used to determine sysroot support. The awk script is currently unable to handle loading of qmake features and thus configure will not detect the compiler correctly. This is the case when using device profiles. The qdevice.pri is loaded through the qmake feature file device_config.prf. One possible way to fix this is to move this detection after qmake is built and make this a .pro based config.test. However, this cannot be done because the sysroot is actually baked into the qmake binary as the QT_SYSROOT variable. The solution is to remove this check completely and let the build fail when Qt starts compiling with --sysroot. Change-Id: I6c3b7ec2c8e5e390d6f5b1e602d656682d610b98 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Document configure's -sysroot optionGirish Ramakrishnan2012-03-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -sysroot has been undocumented so far. Change-Id: I552f9233778de9490a3479292f0cda9c8c439282 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Stop erasing mkspecs/modules at every reconfigure.Thiago Macieira2012-03-271-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Developers who are building & rebuilding Qt often end up needing to recompile all other modules because of this removal even though the libs are still compatible. Change-Id: I4ec0e8ab222675dcd2a3f3a2b5e931c1c7f31f69 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Disable EGL (and thus EGLFS) if we're not using OpenGL ESThiago Macieira2012-03-271-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EGL support in src/platformsupport/eglconvenience requires OpenGL ES to be enabled, so it makes no sense to test for the presence of EGL if we're not enabling OpenGL ES. EGLFS has similar requirements, so ensure it gets disabled too. Otherwise we're going to get lots of undefined symbols in the EGLFS plugin to things in QtPlatformSupport that did not get compiled in either. Change-Id: Ie55dd2e2597ec0594aa589ee8aac150c71104b46 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Remove obsolete references to QWS from configure script.Jason McDonald2012-03-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-24027 Change-Id: Id7be20aa4438e590d629ec96f5ad817866f83764 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | Configure QPA cleanupDonald Carr2012-03-271-1046/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PLATFORM_QPA is always true PLATFORM_X11 is always false remove/collapse all related conditional statements to lend greater clarity to the configure script Change-Id: I4998edf5402019370333ed79effcd0cacafbe87d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | | Remove 'tests' as default build part.Marius Storm-Olsen2012-03-271-1/+6
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires 'configure -make tests' if you want to automatically build autotests for a module by default. You can still go into the individual tests/ directories and 'qmake && make check' to build and run the autotests. configure -developer-build will enable the tests by default, like it did in Qt4. Change-Id: If4d870987de0947a8328509dcc227fa9e6284201 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | device: Add -device and -device-option to configureGirish Ramakrishnan2012-03-271-3/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Reunite NAS support in configure with QSoundDonald Carr2012-03-261-10/+0
| | | | | | | | | | | | | | | | | | | | | RIP Change-Id: I7c47052ce4962f10dbcbbb8d48f05b3158d4a69a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | configure: Fix x86_64 arch detection (part 2)Bradley T. Hughes2012-03-241-1/+1
| |/ |/| | | | | | | | | | | | | | | | | This is a follow-up to comit 70a88331519e6e6439ff23a9cc91b2e3f607acb6. The regular expression for CFG_HOST_ARCH was not updated in the above commit. Change-Id: I2baf0b42d851f1df096c2f6ad54aeec57940e661 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* | configure: Fix x86_64 detectionBradley T. Hughes2012-03-231-1/+1
| | | | | | | | | | | | | | | | | | The regular expression should look for underscores in addition to alphanumeric characters. Change-Id: Idc3dbd67291ec1420f818d74fba8413b1e7cbcf1 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* | Make architecture detection more robust.Girish Ramakrishnan2012-03-221-2/+3
| | | | | | | | | | | | | | | | | | Any message/error in mkspecs or qmake feature files ends up confusing the current arch detection logic. Instead, search for "Project MESSAGE: .* Architecture: <arch>". Change-Id: I308932a5b75f3a1fcbc4fe30c74faf2e83b2d752 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Save the pkg-config settings in config.statusThiago Macieira2012-03-221-0/+4
| | | | | | | | | | Change-Id: I6fc14eaf071ff56325bbcabb0ae8971fcf07b370 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | MIPS DSP configure detection and initial blend optimizations.Damir Tatalovic2012-03-221-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new MIPS configure test and -no-mips_dsp and -no-mips_dspr2 configure options. List of optimized implementations: - comp_func_SourceOver - comp_func_Source - qt_memfill32 - qt_destFetchARGB32 - qt_destStoreARGB32 - blend [RGB32][RGB32] - blend [ARGB32_Pre][RGB32] - blend [RGB32][ARGB32_Pre] - blend [ARGB32_Pre][ARGB32_Pre] Change-Id: I35411858295b7b3f4895eb56e3b93397528903cc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Fix cross-compilation that uses fontconfig / freetypeThiago Macieira2012-03-221-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | config.tests/unix/freetype.pri has a !cross_compile flag, so we must find freetype using the proper detection methods. The detection was inside an X11 section of configure, so move that out. And use the results of that detection, now that QMAKE_CFLAGS_X11 isn't used (since we're not building X11 in QtPlatformSupport). Change-Id: Ic8f5cfb7263849bfb12967756def2b5aaa244872 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Fix the bsymbolic_functions test and improve the error reportingThiago Macieira2012-03-221-1/+11
| | | | | | | | | | | | | | | | | | | | | | The bsymbolic_functions test was missing $SYSROOT_FLAG, so the linking was always failing and the test falsely negative. Also make the error reporting better: if the flag was requested, error out if the check fails and report more information in -v mode. Change-Id: Ie2615f8083e7e58d63d9ee9c23be937dc864b30d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Add x86_64 to CONFIG on Mac OSX only when not cross-compilingSean Harmer2012-03-221-1/+1
| | | | | | | | | | | | Change-Id: Idd066010334999376d8b2c9619d797e4eb1f1153 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>