summaryrefslogtreecommitdiffstats
path: root/config.tests
Commit message (Collapse)AuthorAgeFilesLines
* Ensure that qXXXdetection.h can be included directlyThiago Macieira2012-04-211-0/+1
| | | | | | | | | Those files might have dependency on one another, on qconfig.h and on early qglobal.h definitions, so ensure that the only correct include order is that of qglobal.h. Change-Id: I89098bacaf16353ee8b51604ee885508dc8e201a Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Add a functionality test for DirectFB to ensure it compiles.Thiago Macieira2012-04-192-0/+54
| | | | | | | | | | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/master' into api_changesOswald Buddenhagen2012-04-101-1/+1
|\ | | | | | | | | | | | | | | | | | | 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
| * Fix scopes on iconv related pro/pri filesRafael Roquetto2012-03-271-1/+1
| | | | | | | | | | | | | | | | | | Ensure corelib and the iconv configure test link against libiconv on QNX-based platforms. This now includes the Blackberry mkspecs which were previously excluded. Change-Id: I60677ab8506b7cf47f504b880bb1078036984e85 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge master into api_changesKent Hansen2012-03-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | 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
| * device: Add -device and -device-option to configureGirish Ramakrishnan2012-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Add detection of AVX and AVX2 support in the compiler.Thiago Macieira2012-03-232-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-236-163/+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>
* Make architecture detection more robust.Girish Ramakrishnan2012-03-222-15/+15
| | | | | | | | | 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>
* Fix the bsymbolic_functions test and improve the error reportingThiago Macieira2012-03-222-1/+7
| | | | | | | | | | | 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>
* EGLFS: Integrate building into configure.Donald Carr2012-03-212-0/+0
| | | | | | | | | | With the move to the QPA architecture EGL is now only required by individual platform plugins and the configure script has been adjusted to reflect this. Change-Id: Ieadacef0b970f29752d9e3e36a007e5cbb005b0d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fix stltest compilationGiuseppe D'Angelo2012-03-201-0/+1
| | | | | | | | | | The usage of std:ptrdiff_t in the test requires the #inclusion of the cstddef header. Task-number: QTBUG-24828 Change-Id: I7e1ca6ee010469708f8da1709563b5ebced972e5 Reviewed-by: Anssi Eteläniemi Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Improves configure checks for XCB.Bradley Smith2012-03-191-0/+3
| | | | | | | | | The XCB plugin requries libxcb >= 1.5. Configure and config.tests/qpa/xcb now check for this. Change-Id: I96c688b79bf5b49fd3ecc4ddc12ebdc2d3788790 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* arch: Undefine possible architecture definesHolger Hans Peter Freyther2012-03-161-0/+13
| | | | | | | | | | | | | Some compilers define the architecture to one leading to detecting '1' as target architecture. Always undef the architecture name. Compilers: gcc version 4.6.3 (Debian 4.6.3-1) has '#define i386 1' gcc version 4.5.3 (Broadcom stbgcc-4.5.3-1.3) has '#define mips 1' Change-Id: I7af1bb743579be472467c74e6c08638648823ef3 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove -arch argument and #define QT_ARCH from configuresBradley T. Hughes2012-03-132-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove redundant wayland stuff from QtBaseJørgen Lind2012-03-122-58/+0
| | | | | | | | | | | Config checks are done in the module. We pick up the pkg-config stuff also in the module. There shouldn't be a need to do this in configure anyway Change-Id: I9ef73760511c6b684c6cd5dd13e7e581c588e7aa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixing iconv test to match new mkspec nameRafael Roquetto2012-03-071-1/+1
| | | | | | | | Fixed iconv.pro file to follow the qnx mkspec renaming from blackberry- to qnx- Change-Id: I91e0e2495d0ec70c6ffec3e3e83eb8712805b3aa Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Query udev build parameters from pkg-configDonald Carr2012-03-071-1/+2
| | | | | | | | 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>
* Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-03-041-22/+0
|\ | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-5.0.0 mkspecs/features/qt_module_config.prf qmake/project.cpp qmake/property.cpp Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296
| * remove bizarre padstring voodooOswald Buddenhagen2012-02-291-22/+0
| | | | | | | | | | | | | | | | | | evidently, The Author had no clue that the compiler will do that automatically. as it happens, the windows configure already did it right. Change-Id: I7ebc018c254b316205348874ffa527526329b630 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Remove Q_BYTE_ORDER and -*-endian arguments from configuresBradley T. Hughes2012-03-023-119/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not write Q_BYTE_ORDER to qconfig.h in the configures. Instead, we #define Q_BYTE_ORDER in qprocessordetection.h, since many CPUs only support a single endian format. For bi-endian processors, we set Q_BYTE_ORDER depending on how the preprocessor sets __BYTE_ORDER__, __BIG_ENDIAN__, or __LITTLE_ENDIAN__ (instead of using a compile test to do so). For operating systems that only support a single byte order, we can check for Q_OS_* in addition to the preprocessor macros above. This is possible because qprocessordetection.h is included by qglobal.h after Q_OS_* and Q_CC_* detection has been done. Do this for Windows CE, which is always little- endian according to MSDN. Change-Id: I019a95e05252ef69895c4b38fbfa6ebfb6a943cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Remove ARMFPA support and Q_DOUBLE_FORMAT detectionBradley T. Hughes2012-03-013-132/+0
|/ | | | | | | | | | | | | | | | | Remove the -armfpa option the config.tests/unix/doubleformat* detection. The places where we used QT_ARMFPA and Q_DOUBLE_FORMAT has been removed as well. Rationale: ARM FPA with GCC does not work with EABI. Qt currently does not support compiling without EABI, making ARM FPA an impossibility. It is unknown whether other compilers provide ARM FPA support with EABI. Support for ARM FPA can be re-added in the future should the need arise, but since ARM VFP is available for ARMv5 and up, we should encourage implementors to instead use soft-floats or VFP. Change-Id: I3671aba575118ae3e3e6d769759301c8f2f496f5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove stale QWS considerations from configureDonald Carr2012-02-288-213/+0
| | | | | | | | | | | Remove all reference to QWS/EMBEDDED in configure script Remove legacy qws config tests Change-Id: I09ed3d82bdda0fd0f9da87634d0cd1b7457a782b Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* configure: fixed stray output from endian.test when not verboseRohan McGovern2012-02-281-1/+5
| | | | | | | | | | | | | | | | | | | | | The output of building and running config.tests are generally silent unless -verbose is passed to configure. However, there was one place in endian.test where a check for $VERBOSE was missed, leading to confusing output like: Creating qmake. Please wait... rm -f endiantest.o rm -f *~ core *.core rm -f endiantest rm -f Makefile rm -f endiantest.o rm -f *~ core *.core rm -f endiantest rm -f Makefile Change-Id: Idabe85f2b188ed9da713392d116d4d2853be2189 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Clean up default arch setting on Mac OS XBradley T. Hughes2012-02-171-33/+0
| | | | | | | | | | Remove config.tests/mac/defaultarch.test, but do the same type of default arch detection, only using the qmake binary instead of compiling an empty file. Qt 5 will only support 10.6 and up, which means we only support i386 and x86_64 now. Change-Id: I24949ac803b965c523b1ee45cf769e266dcde134 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Remove unused config.tests from config.tests/mac/*Bradley T. Hughes2012-02-174-207/+0
| | | | | | | | | | | | | The xarch.test and crc.test are not run by configure, so remove them along with the related CFG_MACH_XARCH and QT_NAMESPACE_MAC_CRC configure variables. The kEventClassQt variable in qt_mac_p.h is also unused now, so remove it as well. Change-Id: I596ab9b493ce3164b6a4d40e8942479efc91b60d Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix host endian detection when compiling with sysrootSimon Hausmann2012-02-141-1/+2
| | | | | | | | | | Apply the sysroot argument for the endian test only for the test used for detecting the target endianness, don't use --sysroot for the host detection. Change-Id: I53edda6ebfd06e73cc64f2561b707bd2ba052ae7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Reorganize evdev pluginsLaszlo Agocs2012-02-084-0/+113
| | | | | | | | | | | | | | | | | | | | | | | | | linuxinput becomes evdevmouse. The experimental touch code is removed, now the plugin's purpose is solely to generate mouse events from absolute and relative pointer events. The plugin key is EvdevMouse. touchscreen becomes evdevtouch. The plugin key is EvdevTouch. In case keyboard support appears some day, it will fit nicely in the system by the name of evdevkeyboard or similar. Some little udev code is moved to platformsupport so it can be shared between the plugins. This may be extended later if more sophisticated udev support is needed. N.B. the intention is to keep this as simple as possible. We are shipping these plug-ins as reference examples, not as full-featured drivers. evdev and udev support has configure time tests from now on. This means the "drivers" (generic plugins) will get built automatically when the support is available. Change-Id: Iaf6260b5c2edfb9f25d070d2764466725adc6b4e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Improve sysroot handling with regards to configure tests.Simon Hausmann2012-02-033-3/+3
| | | | | | | | | | | Some configure tests try to link programs, which when compiling against a sysroot _does_ require the --sysroot= argument in order to find crt0.o. This patch uses the existing pattern of using the export SYSROOT_FLAG in the missing linking tests. Change-Id: I063849c814f393d5f88de1b486ce9035b9f7bf65 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add support for QNX iconv implementationRafael Roquetto2012-02-031-1/+1
| | | | | | | | | | | QNX implements the POSIX version of iconv (with non-const function signatures). However, it is still necessary to link with libiconv, unlike most cases. Also, its iconv_open does not know how to handle an empty string. Change-Id: I8654703e46b9c64503aca5521ce7fae1c97d7968 Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Moving tiff image format support and libtiff out of qtbaseaavit2012-01-312-69/+0
| | | | | | | | | | The tiff plugin and bundled libtiff is moving to the qtimageformats project on Gerrit. Task-number: QTBUG-23887 Change-Id: I4c848232fdccddd7e7f54215f9eaa78dc4c3a53d Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove Symbian specific code from qtbase.Xizhi Zhu2012-01-312-11/+0
| | | | | Change-Id: I27d37d914b71e1e43c94e2a975ffec49e1ecd456 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3091-90/+91
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I311e001373776812699d6efc045b5f742890c689 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QRegularExpression: configure support for PCREGiuseppe D'Angelo2012-01-262-0/+54
| | | | | | | | | Added PCRE config.tests, and logic and command line options (-qt-pcre and -system-pcre) for configure and configure.exe. Change-Id: I5da2658191198dbcf48c07d7c5de1be1b884a7a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove support for the MNG file format and the bundled libmngaavit2012-01-252-58/+0
| | | | | | | | | | | | | The MNG file format is generally abandoned, and libmng has been unmaintained for several years. The MNG plugin and bundled libmng has been moved to the qtimageformats project on Gerrit. Task-number: QTBUG-21869 Change-Id: I946432347014ffde2b72307a5f8b166ca5553602 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Update contact information in license headers.Jason McDonald2012-01-2391-91/+91
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I431bbbf76d7c27d8b502f87947675c116994c415 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove ICD plugin for bearer.Xizhi Zhu2012-01-102-58/+0
| | | | | | | It's only used by Maemo and Harmattan, thus not needed in Qt5. Change-Id: I8638f4fc63637be88d1aa584cde7e3a4116f2de6 Reviewed-by: Alex <alex.blasche@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-0592-92/+92
| | | | | Change-Id: I02f2c620296fcd91d4967d58767ea33fc4e1e7dc Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix fvisibility.test for "QMAKE_CXX = ccache g++"David Faure2011-12-181-2/+2
| | | | | | | | | | | | | | | Testcase: adding this line at the end of mkspecs/linux-g++-64/qmake.conf QMAKE_CXX = ccache g++ Result: fvisibility.test: line 28: ccache g++: command not found Symbol visibility control disabled. Result after fix: Symbol visibility control enabled. Change-Id: I4049264a38a43e1bee3cb823d53836f0689f0b53 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Added '-' parameter to fix strings command using gcc-llvm on Mac OS 10.6 w/ ↵Chris Meyer2011-11-081-2/+2
| | | | | | | Xcode 4.2. Change-Id: Ib44c17c92fd67e8ffe3f34fa9c6014d8f0d861a8 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* remove symbian support from configureJoerg Bornemann2011-11-076-156/+0
| | | | | Change-Id: Ib37defb1a69b3f8e5e5c6698f022291849f52716 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add multipoint touch support for Harmattan to the xcb platform plugin.Jocelyn Turcotte2011-10-172-0/+79
| | | | | | | | | | | Proper multipoint touch support was only introduced in XInput2.1, but Harmattan uses a tweaked version of XInput2.0 that transfers touch data through mouse events. This patch applies on the xcb plugin a subset of the changes that were applied on the Qt 4.7 that was shipped to Harmattan to get similar multipoint touch support. Change-Id: Ifda7ad40de29d7ded1443d4f78b3ec3807303a9f Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Fix build on Harmattan when cross-compilingSimon Hausmann2011-10-131-0/+5
| | | | | | | | | | | | When configure detects the presence of font-config/freetype via pkg-config _and_ we are cross-compiling for Harmattan, make sure that we pick up the include path for freetype. The .pri file is included in various places in qtbase when the usage of freetype is required. Change-Id: I4a5390dfc063504def80a891bc9153d6a376ccd7 Reviewed-on: http://codereview.qt-project.org/6509 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix warning caused by putting .mm files in SOURCESTor Arne Vestbø2011-09-261-1/+1
| | | | | | | | | They should live in OBJECTIVE_SOURCES instead. Change-Id: Iaf3f6ae4d8b71600c8ea91e33cf860b326855988 Reviewed-on: http://codereview.qt-project.org/4971 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* Fixed xcb-render config test.Samuel Rødal2011-09-191-1/+1
| | | | | | | Change-Id: I5f9f2beb57a2bc6b4e44dcd71a03cfdcf69cae45 Reviewed-on: http://codereview.qt-project.org/5086 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fix Xcb autodetection during configure.Jędrzej Nowacki2011-09-152-0/+10
| | | | | | | Change-Id: I550e633d49cfcf4df393ae7d691e7f407276eb58 Reviewed-on: http://codereview.qt-project.org/4781 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix for wayland config.testAndy Nichols2011-09-071-2/+10
| | | | | | | | | | | | | | Wayland config.test would only be able to build if there was a valid value for QMAKE_LIBDIR_WAYLAND because if this was empty, -L would be used, which would lead to invalid command syntax. So even if the library was already in the build path, the test would fail. The test now checks QMAKE_LIBDIR_WAYLAND for valid directoires first before add them to the LIBS variable. Change-Id: Ic3a3be54a41390d6302a122a6d20f896e962ccc7 Reviewed-on: http://codereview.qt.nokia.com/4354 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-08-301-1/+0
|\ | | | | | | | | | | | | Conflicts: src/src.pro Change-Id: Ic04fb170b82e86dc3cef6fe979f8fb709db10daf
| * Fix fontconfig configure testJiang Jiang2011-08-291-1/+0
| | | | | | | | | | | | | | | | It does not necessarily require X11. Change-Id: Ie10f91b2052af21ea877d6c7d322fc43e84108cb Reviewed-on: http://codereview.qt.nokia.com/3815 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* | Move XCB event reading to a separate thread.Samuel Rødal2011-08-262-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Work-around for bug in XCB which causes a xcb_wait_for_reply to block if xcb_poll_for_events() is called simultaneously from a different thread. If the XCB version is too old this work-around causes even more problems, so we kill two birds with one stone by only using the work-around if the XCB version has the recent xcb_poll_for_queue_event() function, which we also need to read events from a separate thread with reasonable efficiency. Change-Id: I8a899dad6ded381ce42cba0112e77da3c8aa6887 Reviewed-on: http://codereview.qt.nokia.com/3612 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>