summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
...
* QNX: Enable additional CPU features to be compiled in for QNXSean Harmer2012-06-141-0/+9
| | | | | | | The QNX toolchain can use Neon on ARM and SSE<X> on x86/x86_64. Change-Id: I36c61fa12b65d806b3cc60a0aefcb63964f9ab7e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* eglfs: mark overriden methods with Q_DECL_OVERRIDEGirish Ramakrishnan2012-06-131-4/+5
| | | | | | | | | The current cursor implementation can be a bit hard to read without hints about which methods are overriden. Change-Id: I3376890a13be46e1ece03d1442dd5a15ccd61382 Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix compile issue on AIXAndy Shaw2012-06-121-1/+1
| | | | | | | | | Since local thread storage is used we need to turn this on for the xlc compiler with the -qtls flag. Change-Id: Ib40ec87edada56a062b0c72b7d47b38a6d0b5b13 Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add SSE2/AVX/Neon/etc. flags to mkspec win32-g++-crossMark Brand2012-06-121-0/+9
| | | | | | | | | Follow-up to 6a51062e996ec38b3ebc1e0de04af73a5c62a1a0 which did this for win32-g++. Change-Id: I3ba0dd8ffca46853844b55b16dc92270fa8a623a Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* raspberry pi: Dont use the video layer for EGLFSJohannes Zellner2012-06-121-1/+1
| | | | | | | | | | The OpenmaxIL video_render component uses the dispmanx layer 0, so EGLFS should use at least z index 1. Otherwise the video_render would conflict with the UI and thus overpaints it. Change-Id: I3bed23567fa8c4399207289c6ef952c5a5e0d503 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com>
* raspberry pi: add /opt/vc/include/interface/vcos/pthreads to includesGirish Ramakrishnan2012-06-121-1/+1
| | | | | | | | See https://github.com/raspberrypi/firmware/pull/32 for more information. Change-Id: I51bb532336ed069cde938540cd962721b1a72adb Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Move the SSE2/AVX/Neon/etc. flags into the compiler mkspecsThiago Macieira2012-06-128-0/+61
| | | | | | | | | | | | | 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>
* Expand the 'existing target guard' in generated CMake files.Stephen Kelly2012-06-071-19/+20
| | | | | | | | | | | | | | | | | | | | This way the target will be created and have its properties populated only one time. I tried wrapping the whole file in an 'include guard', but that broke the unit test in tests/auto/cmake/pass1 (and the qt5_use_module function), because the function causes the variables in the Config file to not exist outside of the scope (eg for include directories), and yet, Qt5${Module}_FOUND is still true even when the find_package was previously called in a function, so it is not found and processed again. The change in Qt5CoreConfigExtras.cmake does not need to be guarded as it is only ever included from Qt5CoreConfig. Change-Id: Iaa016563db5eb61294360ac9e003c9c923393d8c Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix common device spec pathsDonald Carr2012-06-071-3/+3
| | | | | | | | | | | This fixes breakage in the Raspberry Pi spec introduced in: https://codereview.qt-project.org/#change,27536 due to incorrect depth assumptions regarding included files. Change-Id: I802b828f1755f299939fed192dd3ca9bf1a83002 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Generalize common device properties out of Raspberry Pi specDonald Carr2012-06-063-35/+47
| | | | | | Change-Id: I58cc9c9219bf3e9ed8e7401cb66f968306d7bfc9 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* configure: Auto-detect and enable C++11 support if availableBradley T. Hughes2012-06-056-0/+13
| | | | | | | | | | | | | | | | | 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>
* eglfs: implement hardware cursor for the raspberry-piGirish Ramakrishnan2012-06-011-36/+183
| | | | | | | | | | | | | | | | The cursor is rendered on a dispmanx layer and moved around. This approach saves us from having to update the underlying window each time the cursor moves. Dispmanx layers cannot be moved to negative coords. As a result, currently it is not possible to move to a location less than the hostpot. A future commit will fix this problem. Change-Id: Ida5ee961d03a6929860c515e503482756a4913ed Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Andy Nichols <andy.nichols@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove all references to X11 session managementDonald Carr2012-06-0147-47/+0
| | | | | | | | | There is no session management currently implemented for the xcb QPA backend. Update the build system to reflect this. Change-Id: I3486de5741f1fb7e09330ca142b8235a84d3b91d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Move the sub-architecture feature to better places in qmakeThiago Macieira2012-05-312-13/+13
| | | | | | | | | | | | | | | | | | | Instead of saving the ability of the compiler to produce SSE2, AVX, Neon, etc. code in .qmake.cache (Unix) or qconfig.pri (Windows), move everything to qmodule.pri. Accordingly, move the DEFINES += settings to qt_module.prf instead of qt.prf. This allows us to re-use these settings in other Qt modules (other than qtbase), if necessary. Though currently the extra compiler definitions are found only in src/gui/gui.pro. They can be moved elsewhere when it becomes necessary. As a side-effect of this change, some other flags are moved from .qmake.cache to qmodule.pri (on Unix). The flags that are getting moved should probably be moved anyway. Change-Id: Ibc3ab0111e148d81870772f9357273660aa93417 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Overhaul the qsimd_p.h: rename macros and update conditionalsThiago Macieira2012-05-311-8/+11
| | | | | | | | | | | | | | | The QT_HAVE_xxx macros are replaced with QT_COMPILER_SUPPORTS_xxx. They indicate that the compiler supports those intrinsics, but not necessarily that they can be used right now. ICC and MSVC allow one to use the intrinsics anywhere, but for Qt all uses of the intrinsics are either in specially-built files, protected by runtime checks, or they are unconditional (qstring.cpp). So we only use the intrinsics when the compiler was instructed to generate code for that instruction set anyway. Change-Id: Ie58eebbc0518ad1d5420a85174fd84153bb9abaa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Windows: Add ANGLE support.Friedemann Kleint2012-05-315-2/+19
| | | | | | | | | | | | | | | | | | - Add QWindowsEGLContext usable for ANGLE and Windows CE. - Add QWindowsEGLStaticContext containing the display for resource cleanup. - Add EGLSurface to QWindowsWindow. - Add a -angle option specifying the path to the external ANGLE installation to configure, add libraries to the mkspecs. Initial-patch-by: Jabot Corentin <corentinjabot@gmail.com> Task-number: QTBUG-24207 Change-Id: I5f80b1efb6996da7c5d70aa3720f7801c9e4c6af Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Add hard float-abi support to Raspberry Pi specDonald Carr2012-05-301-1/+8
| | | | | | Change-Id: I1bed28bdb5f84e61605972713a20359cc6deeaa6 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* Introduce a Snowball mkspec to the device specsDonald Carr2012-05-252-0/+75
| | | | | Change-Id: I7aa2f1a719c424079d7f0d7b3410f293cee05fa9 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* -device: remove redundant check for empty CROSS_COMPILEGirish Ramakrishnan2012-05-242-3/+0
| | | | | | | | | | Remove the check from ST7540 and PNX8473 specs since it's already checked in deviceSanityCheckCompiler Change-Id: I2accb12f9e692e253f76194ca68b1f4cc673a833 Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* bcm97425: Fix linking the directfbegl QPA pluginHolger Hans Peter Freyther2012-05-241-1/+2
| | | | | | | | | | directfbegl requires libQtPlatformSupport to provide some EGL helper functions. Enable EGL by adding it to the QT_CONFIG variable in the qmake.conf. Change-Id: I80d3163d9da4b9eb232aea72ba7d4388453f8247 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Enable extra warnings for win32-g++ mkspecsJonathan Liu2012-05-232-2/+2
| | | | | | Change-Id: I09d6ed18007f29bad84e757f2916c6f7323e5b44 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* devices: Allow to pick up the compiler from the pathHolger Hans Peter Freyther2012-05-231-2/+7
| | | | | | | | | | | Re-enable checking if the compiler is in the path. The previous commit dealt with a user/spec author not setting CROSS_COMPILE and then picking up the host g++. Re-add the 'which' check, but put it after the sanity check for the CROSS_COMPILE variable. This check assumes that QMAKE_CXX is of the form "${CROSS_COMPILE}g++". Change-Id: I54f7e058a75d26d73eca5a860946a6854ce91d67 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* device: Check CROSS_COMPILE in deviceSanityCheckCompilerGirish Ramakrishnan2012-05-231-4/+6
| | | | | | | | | | | | QMAKE_CXX is initialized by default to gcc. As a result, 'which $QMAKE_CXX' always succeeds. This change removes the 'which' check and makes it explicit that CROSS_COMPILE is a mandatory option to -device mkspecs. Change-Id: Icefa9d14fc24086a60c9108ff7d9d16fd9990995 Done-with: Johannes Zellner Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* eglfs/pi: update handles are 'local' variablesGirish Ramakrishnan2012-05-221-2/+3
| | | | | | Change-Id: Iec687e9cd015ed389a637b50e4e4e332478b6e1f Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* Clean up Raspberry Pi specDonald Carr2012-05-221-9/+18
| | | | | | | Introduce platform libs hook to handle/allow device specific initialization and the associated symbol resolution Change-Id: I098b07dcb581390d369d9165c6cedc7ace1e088a Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* win32/default_pre.prf: Remove exceptions_off, thread_off, stl_off.Friedemann Kleint2012-05-211-1/+1
| | | | | | | | | | | | - thread_off, stl_off are obsolete. - exceptions_off causes exceptions to be globally disabled for applications using MinGW after 2b21dd69d6a4e47f0ec3d3958ab1def0983ce76c. Change-Id: Ia109c5806f2a0172efed5680a55ca53a2846d778 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove optimization flag from QMAKE_CFLAGSRomain Pokrzywka2012-05-174-6/+3
| | | | | | | | | -O2 is already the default optimization level for release builds, as defined in gcc-base.conf. In addition, it shouldn't be set for debug builds. Change-Id: Idd7406b0d135d9579676b389050fd6e5776e722c Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Apply compiler platform flags to debug builds as wellRomain Pokrzywka2012-05-174-8/+8
| | | | | | | | | Compiler flags like CPU architecture and FPU should be set on QMAKE_CFLAGS instead of QMAKE_CFLAGS_RELEASE, as the latter only applies to release builds Change-Id: I2e729a9e413934e904fc2810394e118940b8557f Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* turn off exceptions by default where they aren't requiredLars Knoll2012-05-177-3/+15
| | | | | | | | | | | | | This significantly reduces the size of the generated code in places where we don't need exceptions. The -(no-)exceptions configure flag has been removed in the process, as there is now a fine grained way to control this on a per module level, and Qt is being compiled without exceptions in most places. Change-Id: I99a15c5d03339db1fbffd4987935d0d671cdbc32 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add Visual Studio 11 mkspecAndreas Holzammer2012-05-162-0/+135
| | | | | | | | | | | This adds the Visual Studio 11 mkspec and the corresponding changes to configure and qmake makesystem. Change-Id: I3a7e82a6f7f90aa0a94dedd493ebaa66bf100923 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Properly quote all variables which are paths.Stephen Kelly2012-05-161-2/+2
| | | | | | | | This is required if Qt is installed into a directory with spaces. Change-Id: I1d6874265558d712ac98a3aef670c2934a632ab1 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Use IF(NOT TARGET ...) before creating imported targets.Stephen Kelly2012-05-151-3/+1
| | | | | | | | | | | | | | | | | | Initially we didn't do this because someone could accidentally create another target of a conflicting name, and used a variable to store whether we have created the target already or not. That wasn't adequeate to deal with finding the package in a scope like a function, so we used a directory property. However, the directory property is not valid in the same scopes as the defined target. For example, finding a Qt module in both a directory and a subdirectory causes a conflict. As it is already unlikely that a target would be accidentally created with a name like Qt5::Core, we should simply use the IF(TARGET) form. Change-Id: If64f25d45f51edcd1edb0d4bfb5ed3bb2479bd27 Reviewed-by: David Faure <faure@kde.org>
* Set QMAKE_DOCS_INSTALLDIR to $$[QT_INSTALL_DOCS] to allow overriding in .proMarius Storm-Olsen2012-05-152-1/+6
| | | | | | | | | | | | Normally you want to pass -installdir $$[QT_INSTALL_DOCS] to qdoc by default. However, if you want to force the generation of URL links to the documentation, the option cannot be specified. By setting the QMAKE_DOCS_INSTALLDIR variable in default_pre.prf a project may override it at will, as for example Qt Creator would do. Change-Id: Ib31f03acf4e8050cf2dd3aa33f3a10ed027f1df7 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* device: don't set a default cross compile prefixDonald Carr2012-05-157-15/+2
| | | | | | | | | | | | | | qmake -set can be used instead to set a the default cross compile. device_config.prf already contains code to read this default. Remove per-spec CROSS_COMPILE checks Introduce deviceSanityCheckCompiler() usage where appropriate Done-with: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Change-Id: I07c75c9e933dc1174a1bf8bf523b6b4a6b427408 Reviewed-by: Romain Pokrzywka <romain.pokrzywka@kdab.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Use directory property instead of variable to determine target existance.Stephen Kelly2012-05-141-2/+3
| | | | | | | | | This is more resilient to calling find_package in a scope such as a function. Change-Id: I17e69a416f4aed3102fa6195d239bcf4ce0b306b Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Only find dependencies from the same Qt installation.Stephen Kelly2012-05-131-1/+5
| | | | | | | | | | | | Add a PATH to search for dependencies in the current prefix, and disable other CMake searching logic with NO_DEFAULT_PATH. A Qt installation must all be installed to the same prefix currently. If that constraint is ever relaxed, we can turn this into a hint instead. Change-Id: I633cafb7e546dbd102ac0b2ed18db260d26adc51 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove stale udev checkDonald Carr2012-05-121-6/+0
| | | | | | | udev headers now ship as part of the base debian reference image Change-Id: I181c7f48ca59af46fccf8f3204845379d068c023 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* configure: Remove the -dwarf2 argument for Mac OS X buildsBradley T. Hughes2012-05-115-14/+7
| | | | | | | | | | Modern versions of Xcode properly support dwarf2, and as such dwarf2 is always enabled. This change removes the ability to turn it off, making dwarf2 non-optional. Change-Id: I149daeae6048ee8a1ed116363572173ad219102e Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove declarative from qmltestcase.prf.Friedemann Kleint2012-05-111-1/+1
| | | | | | Change-Id: Ia4bf45132a74ec7bbbb2a918088c176f87a26e76 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add underscore to internal implementation detail variables.Stephen Kelly2012-05-101-11/+11
| | | | | | Change-Id: I4c70ed2808396931fff986fbfad5940dd39e74f6 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Include the VERSION_STRING in CMake config files.Stephen Kelly2012-05-101-0/+1
| | | | | | Change-Id: I9f0e9316241b4cb615350876b11ee263f7efd3bf Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Merge branch 'docs-refactoring' into masterMarius Storm-Olsen2012-05-101-0/+27
|\ | | | | | | Change-Id: Iebd1966abace3cdf7f9428dcfc1ded5b124ab113
| * Properly implement a 'make docs' target for subdirs and apps/libsMarius Storm-Olsen2012-05-091-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only call qdoc for projects which sets the QMAKE_DOCS variable to point to a qdocconf file. Exclude examples/ and tests/ from the qdoc run, by adding no_docs_target to CONFIG for those projects. Change-Id: Ic856c8f19db59309302d0602b3e99735609e525a Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | Fix qpa files installationGirish Ramakrishnan2012-05-081-0/+4
| | | | | | | | | | | | | | qpa header files were not installed under qpa/. Change-Id: I243c3a7e83a342f7485791a1a29b65c9a8f25d6b Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | Don't attempt to ask cmake to find the glib dependencies.Stephen Kelly2012-05-081-2/+5
|/ | | | | | | | Those components are not known to FindGTK2.cmake. Change-Id: I4a7fe35d7d118168c24285f3ea8f57822b2facff Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Introduce Arch Linux specific link line to pi mkspecDonald Carr2012-05-051-1/+6
| | | | | Change-Id: I77c99a2f5e25c28ad2d4a13e3b56d3603cd5bb64 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Add mkspecs for 32-bit Mac OS X builds.Morten Johan Sorvig2012-05-0410-5/+215
| | | | | | | | | | | | | | | | Add mkspecs/macx-clang-32 Add mkspecs/macx-g++-32 Add mkspecs/common/clang-mac.conf Skip the rest of the Mac mkspecs (icc, llvm, g++40, g++42, builder, Xcode, xlc) pending a cleanup where we determine which ones to keep. Change-Id: I00ceddfcbdb5119cb132433bad43e4aed016eab2 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Remove all usages of "arch" CFLAGS on Mac.Morten Johan Sorvig2012-05-048-63/+0
| | | | | | | | | | | | | Remove all [PPC|PPC64|X86|x86_64] CFLAGS, CXXFLAGS and OBJECTIVE_CFLAGS. Delete the arch prf files. 32/64 bit arch selection will be made using a different mechanism in Qt 5. Universal builds are not supported. Change-Id: I4664f2c31801cec7fb4d240f41c2c5204a109020 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Revert "Don't use the pri depends line for link dependencies."Stephen Kelly2012-05-031-0/+4
| | | | | | | | | | | | | This reverts commit df43b9a06a73759ba74f23d9c3e91bd0347d1026. Using the same depends information as QMake provides adds a lot of convenience for users, and is mostly 'correct' from a CMake point of view anyway. Change-Id: I8f2a2f74a687c25a0dedcc491ef72ddb5b136090 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* mkspecs: Define compilers and linkers elsewhere for freebsd-g++46.Raphael Kubo da Costa2012-05-031-4/+10
| | | | | | | | | | | | | Commit 996672933a61016fdc0ec6d42d536986c5080ac5 has made the freebsd-g++46 mkspec use g++-base.conf, which on its turn resets QMAKE_CC and QMAKE_CXX to other values. Redefine them to gcc46 and g++46, respectively (and fix the linker values) after the inclusion of g++-unix.conf so the settings are not lost. Change-Id: I2d03548fdc492c5e4c4744b636b29df2cefe2acd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 23:13:17 +0000