summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
...
| * Remove unused -sse (CFG_SSE) optionThiago Macieira2013-12-091-8/+0
| | | | | | | | | | | | | | | | This is a left-over from the cleanup of MMX/3dNow!/SSE support, which we no longer have in Qt. Change-Id: I48388710a499bddb518ae3c2b8a4ad989482f58c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Cascade detection of SSE3 support and upThiago Macieira2013-12-091-0/+15
| | | | | | | | | | | | | | | | | | If SSE2 isn't supported, then SSE3 can't be either. Onwards and upwards for SSSE3, SSE4.1, SSE4.2 and AVX. The test for AVX2 was already there. Task-number: QTBUG-24773 Change-Id: I005258db52d8abcd407a99b8ebcc23cdea8e3d9f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Revert "Move the glxfbconfig configtest to qpa and rename it to glx"Thiago Macieira2013-12-071-35/+24
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a2d3b7c99165cb5c4be6f0dd83a967e1119cf732. That commit broke -opengl es2 builds on Linux desktops (when GLX is available). /usr/include/GL/gl.h:162:17: error: conflicting declaration ‘typedef double GLdouble’ qopengl.h:97:17: error: ‘GLdouble’ has a previous declaration as ‘typedef GLfloat GLdouble’ Change-Id: Id5f48c05803be1a8c03eeffca139b80e9a85a0eb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-051-11/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/macx-ios-clang/features/default_post.prf tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp Change-Id: Iaba97eed2272bccf54289640b8197d40e22f7bf5
| | * Revert "configure: Abort if Xlib isn't present when building for XCB."Oswald Buddenhagen2013-12-031-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the change is wrong for multiple reasons: - it is possible to build qt (the offscreen plugin) with xlib but without xcb, which was impossible after the change - the check was built in a way that if xcb is auto-detected but xlib is missing, configure would abort (instead of disabling xcb), which is unreasonable (cf. linked task) - it should be possible to build the xcb plugin without xlib - it's testing for xcb-xlib and should have the correct #ifdefs. if these are broken, they should be fixed. if this is unrealistic, the build system should be adjusted to this fact ... differently. This reverts commit 683451e7c74d23abb0268a187d28cf7dc7afd032. Task-number: QTBUG-34382 Change-Id: I1c5811e2fb1f09b084b6aeb7350e5f376e1b9b82 Reviewed-by: Nicolás Alvarez <nicolas.alvarez@gmail.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* | | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Simon Hausmann2013-12-091-0/+17
|\ \ \ | | | | | | | | | | | | refs/staging/dev
| * | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-051-0/+17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/sqlite/qsql_sqlite.cpp Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd
| | * | configure: Properly report xcb-xlib configurationAndrew Knight2013-12-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d34cae51 introduced a new configuration parameter, xcb-xlib, but did not remember to set the internal variable after the config test was run, resulting in a potentially incorrect reporting of the option. Change-Id: I979589d9aad2eb5e0fac069dfcd5b329a51ae059 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * | Detect posix_fallocate at configure timeFatih Aşıcı2013-12-011-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Testing feature macros is not enough for uclibc. Fixes build of the built-in sqlite3 with uclibc <= 0.9.33.2. Later versions will have posix_fallocate(). Change-Id: I918a52777ac63624635802221effc6b86fa2269c Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | | | Fix configure option displayFrederik Gladhorn2013-12-061-2/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | This got messed up in merge 4a8273a6fc2e741e811cf5dabc9a3c240306cf7f thanks to automatic conflict resolution. Change-Id: Idbe1545c7d3ee0580bf2c1381dd3e8b2191dc3e8 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-291-29/+56
|\| | | | | | | | | | | Change-Id: Ibb342cc5fc55ff9a3f4b3ecbd53936b57bc13e63
| * | Move the glxfbconfig configtest to qpa and rename it to glxJorgen Lind2013-11-281-24/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We require glx version 1.3 which is where fbconfig is first defined. Also make use of the configure test and report the glx status. GLX support should always take precedence when compiling the xcb backend Change-Id: Ie46834210bf5cd2ac4006ff08379e0d3434ffa2b Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| * | Add new configure parameter for Xcb-XlibAndrew Knight2013-11-281-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new configuration parameter, xcb-xlib, which allows overriding the configure test for that existing configuration option. The use of xcb-xlib in the xcb platform plugin becomes the preferred path for non-OpenGL ES 2 builds, while the EGL codepath is used otherwise. This has the advantage that EGL can be used with Desktop OpenGL if Qt is configured with -no-xcb-xlib. Change-Id: I5018e31fe0399b94f020c671eff9414d00431c44 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
| * | Do not disable egl on desktop gl automaticallyAlbert Astals Cid2013-11-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | desktop opengl and egl are not incompatible with eachother, so there is no need to disable egl when on desktop opengl Task-number: QTBUG-34949 Change-Id: I757c38674a480910d1cb23853c255eb993e107ff Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-261-1241/+993
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the conflicts in msvc_nmake.cpp the ifdefs are extended since we need to support windows phone in the target branch while it is not there in the current stable branch (as of Qt 5.2). Conflicts: configure qmake/generators/win32/msvc_nmake.cpp src/3rdparty/angle/src/libEGL/Surface.cpp src/angle/src/common/common.pri src/corelib/global/qglobal.h src/corelib/io/qstandardpaths.cpp src/plugins/platforms/qnx/qqnxintegration.cpp src/plugins/platforms/qnx/qqnxscreeneventhandler.h src/plugins/platforms/xcb/qglxintegration.h src/widgets/kernel/win.pri tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp tools/configure/configureapp.cpp Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-261-6/+29
| |\| | | | | | | | | | Change-Id: I83ff8f4d7dffd7385013a1bd8a1732a89ee20d56
| | * actually complain about invalid -[no-]{sql|imageformat}-* optionsOswald Buddenhagen2013-11-251-4/+5
| | | | | | | | | | | | | | | | | | | | | Change-Id: I0530d7dcdeb944db76bc708512c57e537f2c95c8 Reviewed-by: Vladimir Minenko <vminenko@rim.com> Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * iOS: Do not skip building QtGraphicalEffects moduleAndy Nichols2013-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QtGraphicalEffects module is a QtQuick2 only module so it is clear why it was left out before iOS had support for QtQuick2, but now it should be built by default. This commit removes QtGraphicalEffects from the iOS module "skip list". Change-Id: Ie0890f6784ad6e276e80bf7a11195c141ca23332 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | * iOS: Do not skip building QtQuickControls moduleAndy Nichols2013-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QtQuickControls is supported for 5.2 though it does not provide the system native "look and feel". This patch removes the module from the iOS module "skip list". Task-number: QTBUG-35033 Change-Id: Icad479f2e4651c02e569e8a86cfe5ac912d8ed10 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| | * iOS: Do not skip building QtMultimediaAndy Nichols2013-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtMultimedia is supported in Qt 5.2 and should be built by default, so it has been removed from the module "skip list" Task-number: QTBUG-35039 Change-Id: Id43f997251bf392b7f6c0166ee06b7364ce30b8e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| | * Add PPS configure checkAndreas Holzammer2013-11-231-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plain QNX 6.5.0 does not have a libpps, the new QNX has a libpps and BlackBerry has it as well. So we need a configure check to not open another mkspec for this platform. This fixes the plain QNX 6.5.0 build. Change-Id: Id4b3876f2385bcb5f3df426945532e7e26133f24 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| * | simplify setting XPLATFORM_MINGWOswald Buddenhagen2013-11-251-1/+3
| | | | | | | | | | | | | | | | | | | | | no need for a separate case block. Change-Id: I8e9f460bc28ea29ff688fde0d777b168440196e1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | move android variable initialization to a sane placeOswald Buddenhagen2013-11-251-9/+8
| | | | | | | | | | | | | | | | | | | | | it's beyond me how it landed in the middle of the sql driver detection. Change-Id: I7d1302e3440b8828a291e3009e9b130a2fdf165f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-201-1132/+898
| |\| | | | | | | | | | | | | | | | | | | Conflicts: configure Change-Id: I0d31f23483ea67c4cac5af16014366e1ba5ac093
| | * clean up mess surrounding PLATFORM_MACOswald Buddenhagen2013-11-201-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | introduce XPLATFORM_MAC which is properly initialized from the spec instead of from the host. use that and BUILD_ON_MAC where appropriate. minor bug: during command line arg validation we use BUILD_ON_MAC even when XPLATFORM_MAC would be in order, because the latter is not available at that point yet. the solution would be delaying the validation, but that doesn't seem worth the effort now. Task-number: QTBUG-33896 Change-Id: I63f361212961bfdd82efde2ca71a1f48904a85fb Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * consolidate all license checking in the earliest place possibleOswald Buddenhagen2013-11-201-482/+409
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... which is right after performing the platform detection, as proper license checking needs to know the target platform. we can do that now, as we moved all more expensive or side effect laden processing to a later point. as a side effect, we also get rid of the weird early cmdline parsing. Change-Id: I0fda0a15a1ea2082603f7097e89aa422853f30fa Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * don't initialize build dir earlier than necessaryOswald Buddenhagen2013-11-201-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | this way, platform detection (and later license checking) become (mostly) read-only operations. Change-Id: I4c5ffcf80feadfeee2c6e927cf0285f46fa6ea43 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * print help right after parsing command lineOswald Buddenhagen2013-11-201-404/+371
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is the only sane thing, and now that there are no dependencies on anything else any more (in particular anything slow or side effect laden), we can actually do it. this removes some nasty OPT_HELP checks spread throughout the code, thus further reducing data dependencies. Change-Id: Ib0a00e1514e2aa25ec3b527ba9f5719e3214640b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * make help independent from options and environmentOswald Buddenhagen2013-11-201-141/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the help would echo the defaults adjusted by command line overrides and environment variables for some options. this was entirely pointless. it also printed the result of the os detection, which was mostly useless. but the primary reason for doing this is reducing data dependencies, so the code can be moved up. not touching the windows configure, as it's a lot harder and currently that behavior isn't in the way of what i need to do. Change-Id: Ide62119091c8494fb3bea2b607f140268f057919 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * do CONFIG+=silent after configure testsOswald Buddenhagen2013-11-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's counterproductive to do it earlier: it's passed down to configure tests, which then log less info than they could. but primarily, this serves the purpose of minimizing the amount of code executed before platform detection. Change-Id: Iff19b8555de19d048ea6d9341af965871b314c54 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * move some option validations to more relevant placesOswald Buddenhagen2013-11-201-39/+43
| | | | | | | | | | | | | | | | | | | | | minimizing the amount of code executed before platform detection. Change-Id: Ib2c0d97ce5040ced8c4c41d74f428fe7d0f75664 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * don't automatically display help on errorOswald Buddenhagen2013-11-201-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's entirely pointless to flood the user with information and force him to scroll back when he most likely just made a typo. apart from that, this reduces the data dependencies, thus easing further refactoring. Change-Id: I7b24274d453de54a4f02481a66d77e27d4ab0657 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * remove hacks to support solaris 2.[56] and aix < 5Oswald Buddenhagen2013-11-201-20/+0
| | | | | | | | | | | | | | | | | | | | | moving dead code out of the way of further refactoring. Change-Id: If558406cdf13d61478634dd7eff644dc67b0e53d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * initialize WHICH, AWK, PERL and MAKE a bit earlierOswald Buddenhagen2013-11-201-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | have this option independent code out of the way before starting option processing. Change-Id: I5a08caeb25689b155c256ef82505c000112f5039 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-11-201-0/+2
| |\| | | | | | | | | | refs/staging/stable
| | * configure: Document that -sdk only applies to the target mkspecTor Arne Vestbø2013-11-141-0/+2
| | | | | | | | | | | | | | | | | | Change-Id: Ie4a9e7c9d2888f92aa891ba8fcc034ea49b22de2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| * | Fix configure script to not dictate OpenGL ES 2 when EGL is enabledJorgen Lind2013-11-191-27/+7
| |/ | | | | | | | | Change-Id: I4d940ef436f21fd915f3d03558fd4fb4c7b3e5b7 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * CMake: Add the qreal typedef type to the Qt5::Core target.Stephen Kelly2013-11-041-0/+1
| | | | | | | | | | | | | | | | | | | | This way, a Qt compiled with qreal=float and one linked with qreal=double can not be linked by a single downstream. That is diagnosed at cmake-time. Change-Id: I9183dbcfef181fadea5321d3154948e8258e4a2a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * make qreal double by default on all platformsLars Knoll2013-10-311-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On modern ARM CPUs there is no speed difference between float and double anymore, so let's rather use double for qreal to avoid rounding and precision issues. Like this we also get much better compatibility with our desktop OSes. This is not binary compatible on ARM, but the old behavior can be restored by passing -qreal float to configure. Change-Id: I2a4b61e19a3dfa6b0bd76734cecf2634c97207fc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * export QT_NO_<foo> equivalents to the build systemOswald Buddenhagen2013-10-311-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this makes it possible to properly exclude entire subprojects based on the availability of features, rather than stuffing every single source file with #ifdefs. the defines are aggregated from the -qconfig <profile>, -no-feature-<foo> and some other configure flags. usage: load(qfeatures) !contains(QT_DISABLED_FEATURES, textarea): SUBDIRS += textstuff Task-number: QTBUG-28102 Change-Id: I83400632d64312fa4b907e1318dddfe27c432387 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
| * fix filtering of system pathsOswald Buddenhagen2013-10-311-21/+23
| | | | | | | | | | | | | | | | | | the path filtering functions assume that DEFAULT_{INC,LIB}DIRS are newline separated lists of unquoted strings, which 8fbf959be broke. Task-number: QTBUG-33714 Change-Id: Ie07909963ac5155a8ac79ca9254f34069925e001 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * duplicate less work while handling -qconfigOswald Buddenhagen2013-10-301-11/+12
| | | | | | | | | | | | | | Change-Id: I8ba6b866f98c9fe7609af71c168023097e32828c Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * iOS: Build libs (including Qt itself) for both simulator and deviceTor Arne Vestbø2013-10-301-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conceptually a Qt for iOS SDK or source build should support building for both simulator and device, based on the same qmake binary and Qt libraries. Qt Creator or Xcode should then be able to use the same Qt version while still building for a single target at a time. This applies to user libraries as well, which shouldn't require switching to a different Qt when changing target platform from simulator to device. We achieve this by using Qt's exclusive_build feature, where we build for the two targets in parallel, and then teach Xcode how to choose the right library dynamically at build time. Change-Id: I06d60e120d986085fb8686ced98f22f7047c4f23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * validate qconfig-*.h against qfeatures.txtOswald Buddenhagen2013-10-291-0/+1
| | | | | | | | | | Change-Id: I59b7e30cfaa2b1bf2c5d4a3e04b5169f3c9439b5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Rewrite qmake's exclusive-build featureTor Arne Vestbø2013-10-251-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to compute the default exclusive build directory, eg 'debug', at configure time, and then set OBJECTS_DIR, MOC_DIR, etc to include this hard-coded default exclusive build directory. We then had to run a post- process step where we replaced the 'debug' part with the current actual exclusive build pass, eg 'release', resulting in long-standing bugs such as QTBUG-491 where we end up replacing parts of the build output dirs that were not part of the original exclusive build directory. We now set the OBJECTS_DIR, MOC_DIR, etc defaults in configure like before, but they do not include any exclusive-build information. The exclusive build directory is handled as a separate step in default_post where we adjust all entries in QMAKE_DIR_REPLACE to be exclusive directories. For backwards compatibility the new exclusive build behavior is only enabled for variables named by QMAKE_DIR_REPLACE_SANE, which for Qt itself applies globally to everything but DESTDIR, and for libs and tools also applies to DESTDIR. The reason for leaving out DESTDIR in the general case is because many tests and examples assume the old behavior for DESTDIR. A side effect of including all the other variables for Qt libs and tools is that the PCH output dir will be uniformly set, which has been an issue on Windows in the past. The addExclusiveBuilds function now takes two or more arguments, each argument being the key for an exclusive build, which can be customized eg. using $$key.{name,target,dir_affix}. Passing more than two arguments results in three/four/etc-way exclusive builds, eg debug/release/profile. Exclusive builds can also be combined, eg static/shared + debug/release by making two calls to the function. We also handle individual targets of combined exclusive builds, eg static/shared + debug/release, meaning it is possible to run 'make debug' to build both static-debug and shared-debug. Task-number: QTBUG-491 Change-Id: I02841dbbd065ac07d413dfb45cfcfe4c013674ac Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Remove superfluous 'libudev ...' lineKai Koehne2013-10-251-1/+0
| | | | | | | | | | | | | | Status for LIBUDEV printed again in the configure output under 'udev ....' Change-Id: I3e0beca4c6de315dc2dfbdc24d83f4d9cd2b8856 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Remove gstreamer configure test.Robin Burchell2013-10-241-40/+0
| | | | | | | | | | | | | | Nothing in qtbase uses gstreamer, so this is just a red herring. Change-Id: I93fb20a70928d84fed8f33ca4c5df38779928f1a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Add configuration for building with imf support on QNXRoger Maclean2013-10-251-1/+21
|/ | | | | | | | | | Avoid need to modify qnx.pro in src/plugins/platforms/qnx to build with imf support. By default detects if necessary headers and libraries are available. Can also be explicitly requested or disabled with -imf and -no-imf options. Change-Id: I3f9780fc189a33e4c93fb4f950111121f8e947c3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* more escaping of slashes in awk regexpOswald Buddenhagen2013-10-181-1/+1
| | | | | | | | apparently some awks need the regexp delimiters to be escaped even within a character list. Change-Id: I74a77022e134cafa269960c5c88a9a88589f1b95 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* de-duplicate QMAKE_DEFAULT_LIBDIRS after allOswald Buddenhagen2013-10-161-1/+4
| | | | | | | | | | | | but this time without reshuffling it. it's actually easy with awk. this makes the resulting qconfig.pri cleaner (and thus easier to debug). and configure needs a few millisecs less to finish. ^^ QMAKE_DEFAULT_INCDIRS doesn't appear to contain dupes to start with. Change-Id: I9eed2cf853cd15d0d24a885b1c3d69f22ffafb36 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 05:53:55 +0000