summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-266-195/+396
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qtemporarydir.cpp One side encapsulated a repeated piece of #if-ery in a local define; the other added to the #if-ery. Made its addition to the other's. src/corelib/kernel/qeventdispatcher_unix_p.h One side moved some members into a struct; this collided with a #undef check that neither side now has. Discarded the #undef part. src/gui/opengl/qopengltexturehelper_p.h 5.7 deleted a bunch of methods; not clear why merge got confused. src/tools/moc/moc.cpp One added a name to the copyright header; another changed its URL. Change-Id: I9e9032b819f030d67f1915445acf2793e98713fa
| * configure and mkspecs: Don't try to find xcrun with xcrunGabriel de Dietrich2016-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | Since Xcode 8 (beta 2) that tool is no longer available through xcrun. We resort to xcodebuild instead. Change-Id: If9d7b535c1cbac2caae0112b2003283aeff34fb9 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| * Android: Add support for clang compilerBogDan Vatra2016-07-205-193/+395
| | | | | | | | | | | | | | | | [ChangeLog][Android] Added support for clang compiler Task-number: QTBUG-50724 Change-Id: I6147021b814fcb230d125c4450c554a7fea8f31e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Change compiler flags for AndroidBogDan Vatra2016-07-191-18/+17
| | | | | | | | | | | | | | Same as Google did here: https://android-review.googlesource.com/#/c/207721 Change-Id: I24b964aae6d79aa41b07a6de30da1d124609066d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-157-6/+26
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/library/qmakeevaluator.cpp One side changed the iterator to use ranged-for, the other changed its body; they only conflicted because the latter had to add braces around the body, intruding on the for-line. Trivial resolution. Change-Id: Ib487bc3bd6e3c5225db15f94b9a8f6caaa33456b
| * Set library strip flags on Apple platformsJake Petroules2016-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | This was missed in ab599a39313c22fd14cc5466cea5c61bbcdbba8e when QMAKE_STRIP was set as a side effect of adding support for separate debug info. Task-number: QTBUG-54212 Change-Id: I86dd040dbefec4c58879c7d029ed89dd8bad3daf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * generalize references to exclusive buildsOswald Buddenhagen2016-07-133-4/+3
| | | | | | | | | | | | | | | | | | | | | | exclusive_builds_post.prf (via default_post.prf) processes debug_and_release into BUILDS, so .prfs which can rely on being executed later (because they are loaded via CONFIG) can rely on BUILDS and related variables. Change-Id: I5677079ad5145bf493af17b4b60347208572fd21 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * remove redundant condition from private module use warningOswald Buddenhagen2016-07-131-1/+1
| | | | | | | | | | | | | | | | the whole point of the check is ensuring that the message is printed only once for each sub-project, so !build_pass alone is fully adequate. Change-Id: Ib8f821ead6709efc9bfa935e1d05f8caba02a814 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * Add warning when using pkg-config with a Qt build with it disabledSamuel Gaist2016-07-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a warning that will be shown when link_pkgconfig is used in a project but Qt's configuration has it disabled. This can happen when Qt is built before pkg-config has been installed or if it's not detected. This will avoid user losing time trying to make pkg-config work while Qt just ignores it. Change-Id: Ieeff8dd6784b9430cfebef355855ec1be91bc96e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * OpenBSD: add X11R6/lib to QMAKE_RPATHDIRRalf Nolden2016-07-131-0/+2
| | | | | | | | | | | | | | | | As OpenBSD ships its own X11, linker errors occur when not explicitly adding the X11R6/lib dir to rpath dirs. Change-Id: I75991e9d7de115d2d212a017d9c8f9aa93cecc27 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * OpenBSD: redefine g++/gcc commands to eg++/egcc to use newer gcc 4.9Ralf Nolden2016-07-071-0/+15
| | | | | | | | | | | | | | | | | | | | | | On OpenBSD, the system compiler shipped is still gcc 4.2.1 but for proper C++11 support in Qt, QtCreator and Qt-based projects we need to use the compilers provided in ports/packages which have the binaries renamed to eg++/egcc. Therefore, redefine the variables from g++-base.conf to use the newer compilers. Change-Id: Ic8ea1c5d2c2c0263dad5ae85c8c747bcd3985b7d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Enable -WX (warnings are errors) for MSVC 2015Thiago Macieira2016-07-151-3/+3
| | | | | | | | | | Change-Id: Ib57b52598e2f452985e9fffd1458b565f9bda0f8 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-043-2/+5
|\| | | | | | | Change-Id: Ibd81cd1df4a0650d93fcb556a57be90be2e1f569
| * Fix the naming of an LLVM tool in common/clang.confThiago Macieira2016-07-021-1/+1
| | | | | | | | | | | | | | | | Probably was copied from the gcc equivalent. Change-Id: I87e17314d8b24ae983b1fffd14535b9d7f616a1b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * NetBSD: add QMAKE_RPATHDIR for standard QMAKE_LIBDIRRalf Nolden2016-07-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | NetBSD is heavily dependent on using rpath, so we need to add the lib dir QMAKE_LIBDIR and QMAKE_LIBDIR_X11 to QMAKE_RPATHDIR explicitly to avoid linker errors. See http://www.netbsd.org/docs/elf.html for more info. Change-Id: I225143d5e2d9a125060b14e3a8a7953927d63b33 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * winrt: Set minimum SDK version to 10586Maurice Kalinowski2016-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | 10586 reflects Update 1, which is the mininum supported version for many months, hence reflext this in the manifest template as well. There are additional features (like drag and drop) which require and even later SDK version. However, they do not reflect the minimum. Change-Id: I6d71dc499c928ed98c8a25283e0b53994317bb00 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | fix default inc/lib path detection on msysOswald Buddenhagen2016-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | using the Makefile target separator to determine the host system is of course not a terribly good idea. the correct variable to query would be DIR_SEPARATOR, which always reflects the host. however, a direct os query is less obscure in this case. Task-number: QTBUG-54346 Change-Id: I6bc1372a7c9a84a241a97f9f767f046b026411c3 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | don't override user-provided dependencies for our extra compilersOswald Buddenhagen2016-06-238-19/+19
| | | | | | | | | | | | | | | | | | | | | | while the names of the compilers are actually an undocumented internal, we don't provide an actually working proper way to sequence extra compiler execution with build-time generated inputs when they are indirectly listed (as via .qrc files). Task-number: QTBUG-54299 Change-Id: I269c26512897b72706dc8b769aa47e8157c2a5c5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-2322-17/+189
|\| | | | | | | | | | | | | | | Conflicts: src/angle/src/libGLESv2/libGLESv2.pro src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp Change-Id: If8da4cfe8f57fea9f78e7239f378a6302c01674e
| * Fix installation of debug symbols on Apple platforms.Jake Petroules2016-06-221-2/+21
| | | | | | | | | | | | | | | | | | This follows up ab599a39313c22fd14cc5466cea5c61bbcdbba8e, which did not take installation into account. Task-number: QTBUG-54036 Change-Id: Ic1b3acb8984255dd1ca1c288b7b150814ce9e606 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * purge vestige: plugin_no_soname is no moreOswald Buddenhagen2016-06-2213-13/+8
| | | | | | | | | | | | | | | | ... for a loooong time. it was replaced by plugin_with_soname (which is unused so far). Change-Id: Ifc377d155d6eac41e85f3a0914ed817d55b5648b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * fix make -i wreaking havoc in configure tests outside qtbaseOswald Buddenhagen2016-06-221-1/+11
| | | | | | | | | | | | | | the tests would inherit MAKEFLAGS, with somewhat predicatble results. Change-Id: Ia17638f6229d0ae86f5558726850040703d90044 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * limit installation of ANGLE translator and preprocessor helper librariesOswald Buddenhagen2016-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | libGLES2 (the only user of these libraries) is built dynamically even in a static qt built when dynamicgl is configured. in this case the static libraries need not be installed. amends 2311997. Change-Id: Ic9bc3937d6ee0d97e0ca7fc96596fa90ebfe8710 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Add some 64-bit QNX platformsJames McDonnell2016-06-226-0/+148
| | | | | | | | | | | | | | | | | | Add x86-64 and aarch64le QNX platforms. These platforms will be available in QNX 7.0. Change-Id: Iba1f635ba45fddf1a1caf907415a23a510ba0818 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-2016-219/+234
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | And blacklisted a few tests in tst_QUdpSocket. Conflicts: src/android/jar/src/org/qtproject/qt5/android/QtNative.java src/corelib/global/qglobal.cpp src/corelib/global/qsystemdetection.h src/corelib/io/qfileselector.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp tests/auto/network/socket/qudpsocket/BLACKLIST Task-number: QTBUG-54205 Change-Id: I11dd1c90186eb1b847d45be87a26041f61d89ef6
| * Add back osx compatibility check in QMAKE_PLATFORM.Jake Petroules2016-06-161-3/+10
| | | | | | | | | | | | | | If macx is present, osx AND macos should be required. Change-Id: I5cd9d41270c741dc314720a1119b163dd17fdfd7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Common BSD: Add --gc-sections ld flagsRalf Nolden2016-06-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As common bsd's are using the -ffunction-sections flags from mkspecs/common/gcc-base.conf, also use the --gc-sections ld flags like Linux as all are using GNU ld as their linker and all are capable of using it. The last remaining problems with --gc-sections removing the .name sections providing the OS tags for distinction of the execution layer were solved with NetBSD 6.0 and OpenBSD 5.4, see http://gnats.netbsd.org/40401 and http://www.openbsd.org/plus54.html so this option can safely be used now to reduce the size of moc and rcc tools. Change-Id: I74ccd4f6bc607f6d82d32fc864875f26b26bf167 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Update for the newest Darwin-family operating systems.Jake Petroules2016-06-153-6/+6
| | | | | | | | | | | | | | | | | | | | | | - Adapt to the OS X => macOS rename in Q_OS_ macros/docs, qmake scopes, file selectors, etc. - Add new QSysInfo values and MAC_OS_X / __MAC_ / __IPHONE_ values for macOS 10.12 and iOS 9.1 through 10.0. - Update prettyProductName with new macOS "Sierra" codename. Change-Id: Id976530beeafa01b648ebaa16f4a8f0613fcaf75 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Common bsd.conf: add strip command supportRalf Nolden2016-06-151-0/+3
| | | | | | | | | | | | | | | | Add the strip commands for installation commonly used also on BSD systems. Change-Id: I4113ffa559a737ef92afb7c90ab5e1bff902b1bb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Fix the RPi3 spec a bitLaszlo Agocs2016-06-141-4/+3
| | | | | | | | | | | | | | | | | | So that it actually compiles with gcc-linaro-arm-linux-gnueabihf-raspbian. Remove also flags a device spec should not set (like -std and -O). Change-Id: Ib7a3bc298e60715410d5c00fbc22199ab4711fa7 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * Add Mesa VC4 based RPi3 device specLaszlo Agocs2016-06-142-0/+78
| | | | | | | | | | | | | | | | The rpi3 spec added previously is only half of the story now that we have the option to use another GL driver. Change-Id: I1b1edde77bcc6d2f382f1021de9c594c27c34d6f Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * BSD mkspec cleanup for FreeBSD, NetBSD and OpenBSD to common namespaceRalf Nolden2016-06-1110-209/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | BSD OS mkspecs share mainly the same configurations except very few differences. Merge into a common/bsd/bsd.conf file to be used across all BSD OSes in their respective qmake.conf and add a qplatformdefs.h that contain the common defines to be re-used in the BSD mkspecs. The change includes the usage of <sys/param.h> also on NetBSD through the common qplatformdefs.h, which is intended for using NetBSD's version defines. Change-Id: Ibb0ac9e4c8bb5aff7d0febdcab1a4b9600a61117 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | fix detection of default incdirs on macOswald Buddenhagen2016-06-171-3/+4
| | | | | | | | | | | | | | | | don't add framework directories (including the respective marker!). this is consistent with the unix configure code. Change-Id: I2e187057bc3fe2b35128cd5dc2af57b9f3685d83 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | fix logical mismerge from 5.6Oswald Buddenhagen2016-06-174-4/+4
| | | | | | | | | | | | | | | | iphonesimulator_and_iphoneos was renamed to simulator_and_device in 5.7. Task-number: QTBUG-54163 Change-Id: If4a76f45450edc0f6e8fb3615355613212314300 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-0/+41
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qsimd_p.h Change-Id: I7c6bfc5873d97ad7f51a540dd9c18b9359dde59f
| * | Determine the compiler's default include and lib directories at qmake timeKai Koehne2016-05-241-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a long-standing issue for Qt packages, where the paths detected at configure time do not necessarily match the paths on the user's machine. Hence they have been stripped manually from qconfig.pri so far, preventing moc from resolving some includes. The same logic in configure is left alone for the time being, since the paths there are also used to filter paths returned by pg_config and mysql_config. I expect that this will eventually be removed too in a bigger refactoring going on right now in dev. Asking the compiler for implicit paths only works for non-msvc builds - that is, gcc, clang and icc fortunately have a compatible way to retrieve the paths. MSVC works solely on environment variables, which will be taken into account by a separate patch. [ChangeLog][qmake] The implicit compiler directories that moc needs for resolving include files are now determined when qmake runs. So far QMAKE_DEFAULT_INCDIR was determined at configure time, which might be wrong for relocated installations. Task-number: QTBUG-52687 Change-Id: If0706e8c56a5aca2b6e777e79e90342c498726f3 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-1014-215/+32
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/macx-ios-clang/features/default_pre.prf mkspecs/macx-ios-clang/features/sdk.prf mkspecs/unsupported/freebsd-g++46/qplatformdefs.h src/widgets/styles/qgtkstyle.cpp tests/auto/corelib/io/qdiriterator/qdiriterator.pro tests/auto/corelib/io/qfileinfo/qfileinfo.pro Change-Id: Ia943555d1e59234a66f7dc65bdfda838e40001b5
| * | fix ios device&simulator builds againOswald Buddenhagen2016-06-106-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the assumption stated in b67a0836d is actually invalid - configure sets build_all without debug_and_release there. debug_and_release does actually imply build_all, though. to make things less confusing, don't let configure inject iphonesimulator_and_iphoneos into all projects, but handle it like debug_and_release instead. Change-Id: Ib7acdc63308a538862fc603428f81aba60bca08e Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * | Remove a.out defines in OpenBSD and NetBSD mkspecRalf Nolden2016-06-082-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenBSD made the switch from a.out to ELF with release 3.4, published 2003, see http://www.openbsd.org/34.html. In preparation to cleaning up the mkspecs for OpenBSD, remove the a.out defines as only recent versions of OpenBSD (5.8 onward) will be supported. NetBSD switched from a.out to ELF file format with release 1.5, see https://www.netbsd.org/releases/formal-1.5/NetBSD-1.5.html in the year 2000. Remove the defines for older a.out systems now as we are at release 7.0 and only 6.0 onwards releases are currently supported anyway. While cleaning up, remove the old comments for QT_SOCKLEN_T values of outdated OpenBSD and NetBSD releases as well. Change-Id: I8519eab7bcd4af19c0e9f628657878f32b2bd602 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | Remove OpenBSD _POSIX_THREAD_SAFE_FUNCTIONS undefineRalf Nolden2016-06-081-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qplatformdefs.h for OpenBSD included an undefine of _POSIX_THREAD_SAFE_FUNCTIONS because of (at the time) missing implementations of the required _r() functions. After checking these functions http://www.unix.org/whitepapers/reentrant.html against the OpenBSD man pages http://man.openbsd.org/OpenBSD-4.4/cat3/getpwuid_r.0 they are all complete with OpenBSD 4.4 released in 2008. As OpenBSD only supports the current and the last release before (5.8 and 5.9 now), it is safe to assume that this undefine can go away now for sure. Change-Id: I341bcae77d1bd7249ac3fdeaefce9c5eb595eca7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | Delete unsupported/freebsd-g++-46 mkspecRalf Nolden2016-06-082-78/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The freebsd-g++46 mkspec was intended to specifically use gcc 4.6 from FreeBSD ports collection. However, the ports collection moves its "standard" gcc version and uses symlinks to the standard commands (e.g. gcc -> gcc48) on installing gcc. The current gcc in ports is 4.8.5, so the mkspec is not useful at all. Change-Id: I041325d05c7dc3f47f4a774d6f46ba24a601bf3e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | FreeBSD: remove -D_THREAD_SAFE from pthread usageRalf Nolden2016-06-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On FreeBSD, the gcc manpages until Release 5.1 mentioned using the -D_THREAD_SAFE define when using -pthread. This has been obsoleted and the gcc manpages from Release 5.2 onwards have this removed. Now we finally remove this historic relic here, too. Change-Id: I00a5b688c56f46b938c0806fb44b72d5afe5079e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | OpenBSD: simplify mkspec and match portsRalf Nolden2016-06-081-42/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using commmon/gcc-base-unix.conf and common/g++-unix.conf most of the contents of the qmake.conf for OpenBSD can go. The QMAKE_LFLAGS_UNDEF are reset because the linker can't handle environ in libraries, which is only added to libc in OpenBSD 6 (http://www.openbsd.org/faq/current.html) even when explicitly adding -lc to QMAKE_LIBS. See http://lists.llvm.org/pipermail/llvm-commits/Week-of-Mon-20151102/309783.html for similar questions on using -Wl,-z,defs instead. Change-Id: I6c725fb3bc7ae63270912b07f230a480c9157dfd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | NetBSD: simplify mkspec and match supported OS versions (6.x-7.x)Ralf Nolden2016-06-081-46/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using common/gcc-base-unix.conf and common/g++-unix.conf most of the mkspec details can go, leaving us with a minimized qmake.conf. Change the default X11 location to point to /usr/X11R7 after NetBSD switched to X.org in Release 5.0 by default. Also change the default location for addon software on NetBSD, it uses pkgsrc as its ports system which installs to /usr/pkg by default (the default value for $LOCALBASE of pkgsrc on NetBSD), see https://www.netbsd.org/docs/pkgsrc/using.html chapter 4.1. These default values mirror the current state of NetBSD usage to get the prerequisites to compile Qt with a minimum amount of configure parameters. Tested with NetBSD 7.0 using gcc 4.8.4-nb2 (system compiler) Change-Id: Ic50757af9f070c0383c7356302e7e7686f031740 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-0610-156/+33
|\| | | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf config.tests/unix/nis/nis.cpp mkspecs/unsupported/freebsd-g++/qplatformdefs.h src/corelib/tools/qdatetime.cpp src/corelib/tools/qsimd.cpp src/corelib/tools/qsimd_p.h src/network/access/access.pri src/network/access/qnetworkreplynsurlconnectionimpl.mm src/network/access/qnetworkreplynsurlconnectionimpl_p.h src/plugins/platforms/cocoa/qnsview.mm src/plugins/printsupport/windows/qwindowsprintdevice.cpp tests/auto/corelib/kernel/qobject/tst_qobject.cpp tests/auto/network/access/qnetworkreply/BLACKLIST tests/auto/widgets/widgets/qopenglwidget/BLACKLIST Change-Id: I4b32055bbf922392ef0264fd403405416fffee57
| * Initialize the value before using it.BogDan Vatra2016-05-271-7/+7
| | | | | | | | | | | | | | LIBGCC_PATH was used before we initialized it, somehow it magically worked ... Change-Id: I0a9a748ffbfc641f60736b0cf85d23f499b64e66 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Android: Removed super old NDK checksBogDan Vatra2016-05-271-8/+0
| | | | | | | | | | | | Change-Id: I8c16dca1272f0413ac486fd1d54b6c678a8c9dd8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Compile fix: add -lexecinfo on NetBSD and OpenBSDRalf Nolden2016-05-232-0/+2
| | | | | | | | | | | | | | | | | | | | Add -lexecinfo for backtrace(3) on NetBSD and OpenBSD. Without, qlogging.cpp linking will result in undefined references to backtrace and backtrace_symbols. The behavior required is identical to FreeBSD so no additional fixes are required (see src/corelib/global/global.pri:41) Change-Id: I3cfd1d75f1fb5b8505c08a880f91e7b39a5a650d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Move freebsd-g++ mkspecs back for supported FreeBSD 9.3 and upRalf Nolden2016-05-232-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FreeBSD 9.3 is still supported and uses gcc as the default compiler, therefore FreeBSD ports require patching the mkspecs back. To avoid patching, move the mkspecs back to the right place and adapt the path in the qmake.conf/qplatformdefs.h [ChangeLog][FreeBSD] The freebsd-g++ mkspec was moved back and no longer requires the "unsupported/" prefix, matching the FreeBSD ports tree, as FreeBSD 9.3 still defaults to using GCC. Users of GCC that did not previously use the ports patch will need to adapt their build scripts and drop the "unsupported/" prefix. Change-Id: Ideda4a33cccf5381000f6f50b6ae92a5c24ba9d4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Enable -separate-debug-info for mingw toolchainsUlf Hermann2016-05-231-0/+18
| | | | | | | | | | | | | | | | | | | | Having the debug info in separate files is very helpful, especially on memory constrained 32bit systems. When the debug info is compiled into the object files, processes can run out of memory when trying to load them. Change-Id: I1808a32e855d6a62e17e1b734c511b31db5f03f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 23:47:34 +0000