summaryrefslogtreecommitdiffstats
path: root/config.tests/unix
Commit message (Collapse)AuthorAgeFilesLines
* Detect pointer size at configure-time on Windows-hosted buildsMatt Hoosier2013-10-221-0/+1
| | | | | | | | | | | | | | | | | | The configure-time procedure used on Windows does not currently perform the same tests to determine the width of a pointer as are performed on Unix-based builds. This causes QT_POINTER_SIZE to be undefined in the generated qconfig.h file. This in turn breaks compilation of various Qt modules such as QtDeclarative. This patch adds the same level of support for automatically determining the target platform's pointer size, as is currently offered to Unix users. Change-Id: I93838c1759b14089ba9f4daf442048fb5c8da738 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add configure options for [experimental] HarfBuzz-NG supportKonstantin Ritt2013-08-272-0/+63
| | | | | | Change-Id: I15f49b56f49ae53c16db904e03f668c3135edaa5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Disable app_bundle and lib_bundle when running configure testsTor Arne Vestbø2013-07-1644-44/+9
| | | | | | | Just like configure.prf. Change-Id: I760e0ca5bec41b3befb738a8a7a468e8f1a15946 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* config.tests: Fix architecture detection on SolarisSergio Ahumada2013-06-251-2/+2
| | | | | | | | | | | | | | Escaping the '=' signs, otherwise awk fails on Solaris with awk: syntax error near line 1 awk: bailing out near line 1 Could not determine the target architecture! Build type: solaris-g++ (unknown, CPU features:) Change-Id: I201482395c0cec28c10853191032eaa0401f5beb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Android: Handle '<DRIVELETTER>:' in makeabs for Windows usage.Ray Donnelly2013-04-121-0/+2
| | | | | Change-Id: I70de8fe9976a214d143b6174a5d7aebf8e79169b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Whitespace cleanup: remove trailing whitespaceAxel Waggershauser2013-03-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove all trailing whitespace from the following list of files: *.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README excluding 3rdparty, test-data and auto generated code. Note A): the only non 3rdparty c++-files that still have trailing whitespace after this change are: * src/corelib/codecs/cp949codetbl_p.h * src/corelib/codecs/qjpunicode.cpp * src/corelib/codecs/qbig5codec.cpp * src/corelib/xml/qxmlstream_p.h * src/tools/qdoc/qmlparser/qqmljsgrammar.cpp * src/tools/uic/ui4.cpp * tests/auto/other/qtokenautomaton/tokenizers/* * tests/benchmarks/corelib/tools/qstring/data.cpp * util/lexgen/tokenizer.cpp Note B): in about 30 files some overlapping 'leading tab' and 'TAB character in non-leading whitespace' issues have been fixed to make the sanity bot happy. Plus some general ws-fixes here and there as asked for during review. Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Introducing the Qt Android portPaul Olav Tvete2013-03-052-1/+3
| | | | | | | | | | | | | | | | | | | | | Based on the Necessitas project by Bogdan Vatra. Contributors to the Qt5 project: BogDan Vatra <bogdan@kde.org> Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> hjk <hjk121@nokiamail.com> Oswald Buddenhagen <oswald.buddenhagen@digia.com> Paul Olav Tvete <paul.tvete@digia.com> Robin Burchell <robin+qt@viroteck.net> Samuel Rødal <samuel.rodal@digia.com> Yoann Lopes <yoann.lopes@digia.com> The full history of the Qt5 port can be found in refs/old-heads/android, SHA-1 249ca9ca2c7d876b91b31df9434dde47f9065d0d Change-Id: Iff1a7b2dbb707c986f2639e65e39ed8f22430120 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Relax unix compile.test to check the expected file existsRay Donnelly2013-02-201-1/+1
| | | | | | | | | | When cross compiling between two systems that use different program file formats (such as PECOFF vs ELF) -x cannot be relied upon, so -f should be used instead. Change-Id: I4c80646b2b1fbdd6072589d4d9e852adda83424a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Clean up how we build against SDKs on Mac OSTor Arne Vestbø2013-02-192-19/+0
| | | | | | | | | | | | | | | Instead of setting -isysroot in both arch.test, compile.test, the various mkspecs, and sdk.prf, we now propgate the chosen SDK as the qmake variable QMAKE_MAC_SDK, which is then handled exclusivly in sdk.prf. The QMAKE_MAC_SDK variable, and -sdk argument to configure, is expected to be of the short-form name, eg macosx or iphoneos, not a full path, as that's what Xcode also expects. We take care of translating that into a full path for -isysroot/-syslibroot in sdk.prf, using xcodebuild as a helper. Change-Id: I281655b2fa5180c6e78ffdce36824e4a91447570 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Ensure that arch.test for host runs with option(host_build)Tor Arne Vestbø2013-02-181-2/+10
| | | | | | | | | So that mkspecs and features may rely on the host_build test. Change-Id: I18fee4820d9e2904285afcc7ddb8f1cc3d025fef Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-2251-51/+51
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qsavefile_p.h src/corelib/tools/qregularexpression.cpp src/gui/util/qvalidator.cpp src/gui/util/qvalidator.h Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825
| * Update copyright year in Digia's license headersSergio Ahumada2013-01-1851-51/+51
| | | | | | | | | | Change-Id: Ic804938fc352291d011800d21e549c10acac66fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Add support for Linux eventfd(7) in the UNIX event loopThiago Macieira2013-01-152-0/+54
|/ | | | | | | | | | | | | | eventfd(7) uses less resources than a pipe, as it only needs to store a single 64-bit integer, as opposed to a full buffer. It was introduced first on Linux version 2.6.22 and glibc 2.7. However, both the configure-time test and the runtime usage require the use of EFD_CLOEXEC for thread-safety, so this code will be enabled only for Linux 2.6.27 and up as well as glibc 2.9 and up. Change-Id: Ic7e10b28d7b1d4ca24be614ed84055c4429a68e4 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* config.tests/glib: remove app_bundle config (mac compatibility)J-P Nurmi2012-10-091-1/+1
| | | | | | Task-number: QTBUG-26800 Change-Id: I73cad91062c993898567cf9a267a8f6872ba4d52 Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
* Use slogger2 for logging on Blackberry instead of writing to stderrFabian Bumberger2012-10-042-0/+52
| | | | | | | Change-Id: Id0137400f18c8dfe7be7ca44670c16615401d424 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Peter Hartmann <phartmann@rim.com>
* config.tests/fontconfig: remove app_bundle config (mac compatibility)J-P Nurmi2012-09-281-1/+1
| | | | | Change-Id: I77e00ee57f6062de76814f83d947a7e3a7300ebf Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2252-1297/+1297
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: If1cc974286d29fd01ec6c19dd4719a67f4c3f00e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* config.tests/arch: make distclean on the test, not qtMark Brand2012-09-141-2/+2
| | | | | | | | Additionally, qmake no longer needs -o since we are in the project directory. Change-Id: I89dbe829c064663b653e8f747f0849d63ceb367e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add c++11 option to configure.exeKai Koehne2012-09-132-56/+0
| | | | | | | | | | Also check for c++11 support in configure.exe (which is also used by MinGW builds). The c++11 check is therefore moved from 'unix' to 'common' directory. Change-Id: I082848f032c2770e52e34f331b83820f395c06b6 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Yuchen Deng <loaden@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* in non-verbose mode, suppress qmake output as wellOswald Buddenhagen2012-09-101-2/+3
| | | | | | | | | | otherwise missing pkg-config requirements, etc. will be visible. Change-Id: I5a5c0f35cf75e1fcc09ddbc7fcc54cef6bfec8b5 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* mips: Autodetect MIPS DSP rev1 and rev2 instructionsetHolger Hans Peter Freyther2012-09-014-0/+100
| | | | | | | | | | Not every MIPS SoC has the DSP extensions, auto-detect them by using builtin GCC functions. Check for the DSP macros and add the result for rev1 and rev2 to the cpufeatures. Change-Id: I3d6c950f170f102514c43b349f9a23ee796d801a Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QNX: Enable pre-compiled header support for QNXSean Harmer2012-08-271-1/+1
| | | | | | | Change-Id: I6af69965b19c5d0d7a46de8000433bc5f1f2abcb Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Enable symbol visibility support on QNXSean Harmer2012-08-271-1/+1
| | | | | | Change-Id: Ie6015f87976cf16e0474dfa66da885ef24738f6c Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* introduce compileTest functionOswald Buddenhagen2012-08-141-0/+4
| | | | | | | | | | | this cuts down the enormous duplication of identical command line args passed to compile.test. this necessitates the addition of a -config parameter to compile.test, as QMAKE_CONFIG needs to be extended in some cases. Change-Id: I677b2fea4a407b9e4395e70a25e4e349efb0a946 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix Mac OS X architecture detection for non-default Xcode setup.Danny Boelens2012-07-211-1/+19
| | | | | | | | | | | | | The arch.test script is now using SDK settings passed to it. If you install Xcode without the "UNIX Development" option, this is essential to let the compiler find standard headers and let the test program compile successfully. In addition, let configure pass the SDK settings given on the command line to the arch.test script. Change-Id: I49601d3068d83a71e21fdbac287857f2b7abedd1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* android: Fix evdev configure test.Robin Burchell2012-07-061-7/+4
| | | | | | | | Android doesn't define a number of items in its input.h for MT, so don't test for them here. They will still work, they just need manual defines. Change-Id: I471f55b7c7f8950d2048e525119b2b36c8e9743b Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Move DirectFB tests into qpaGirish Ramakrishnan2012-07-032-54/+0
| | | | | Change-Id: I15c90e2e8befef5529b35fa02d3ca6d67a409cc7 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* clang: Do not use libstdc++ when C++11 is enabledBradley T. Hughes2012-06-191-1/+6
| | | | | | | | | | We expect that the C++ library also supports C++11 when the compiler says it does as well. When using clang with libstdc++, the library has no C++11 support or headers, so we cannot use, for example, #include <initializer_lists>. Change-Id: I844877107256f15ab314e8f82fe54434dbb07638 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Move the AVX and SSE tests to config.tests/commonThiago Macieira2012-06-1214-397/+0
| | | | | | | This is the first step in supporting these checks on Windows. Change-Id: I77cfd46bd733161ad2e52c2f76a6354b95ff737d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Move the SSE2/AVX/Neon/etc. flags into the compiler mkspecsThiago Macieira2012-06-129-1/+18
| | | | | | | | | | | | | This allows us to have different flags for the compilers for supporting the same feature. For example, the official flag in GCC to support AVX2 is -mavx2, but ICC does not support it (yet), requiring -march=core-avx2 or -xCORE-AVX2. That flag, instead, enables support for all the features that the "Core-AVX2" processor (codename Haswell) will support. And clearly, the MSVC flags are different. Change-Id: I33b6d8617520925e807747180a8dbaafd79b7a9a Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* configure: Auto-detect and enable C++11 support if availableBradley T. Hughes2012-06-052-0/+51
| | | | | | | | | | | | | | | | | Enabling support for C++11 adds CONFIG+=c++11 to the Qt build. Projects using Qt can check for C++11 support using contains(QT_CONFIG, c++11) in their .pr[iof] files. The QMAKE_CXXFLAGS_CXX11 and QMAKE_LFLAGS_CXX11 qmake varibles contain any arguments the compiler needs to enable C++11. CONFIG+=c++11 adds these arguments to the build. Support for clang, g++, and the Intel C++ Compiler for Linux are included in this commit. Change-Id: Id77f86d7ad4d5c740b890446a40b105879a0d327 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Migrate fontconfig config test to unix scopeDonald Carr2012-06-053-1/+65
| | | | | | | | | | | Fontconfig has no X11 dependency and is of broader use to us than the X11 context. The test should also disambiguate whether fontconfig support is successfully detected or not. This change also removes a false X11 dependency from the freetype test. Change-Id: I68a596aa06f614a64163772fe29a09edba119a81 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* set OUTDIR for consistency with config.testDonald Carr2012-06-011-1/+1
| | | | | | | We depend on this being set correctly set in device_config.prf Change-Id: Iee69c5ce35af26f9ecd6edacdd70e13ae4a9aa90 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Record the sub-architecture (CPU features enabled in the compiler)Thiago Macieira2012-05-301-7/+9
| | | | | | | | | | | | | If the system's compiler has extra features on top of the base settings enabled or if the mkspec or $CXXFLAGS variable included some, record them. This will allow us to choose whether or not to use our own special compilers, based on whether the system default compiler contains it or not. Change-Id: I87cada9fab4cfa58846a831d0a7c7b50d8fa87fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Improve the architecture-detection mechanismThiago Macieira2012-05-301-0/+41
| | | | | | | | | | | | | | For the Unix part, this now obeys the -v option, printing the full command-line it used to compile, allowing testers to identify why something went wrong. Unfortunately, it requires a full compilation cycle, instead of just preprocessing. Just one more among the many on Unix, but maybe a noticeable slow-down on Windows. Change-Id: I654b70d99887e04c96731a5b91be9ad555e4d8fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.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>
* 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-61/+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>
* 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>