summaryrefslogtreecommitdiffstats
path: root/mkspecs/devices
Commit message (Collapse)AuthorAgeFilesLines
* Fix QMAKE_LIBDIR_BCM_HOST for linux-rasp-pi3-g++Joerg Bornemann2019-06-251-1/+1
| | | | | | | | The directory must be prepended by = to denote the sysroot. This amends commit 797f686e. Change-Id: Ib85c0abc58fce3504ecccef0e223b2618ac9149a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix configure comment in/for -device linux-rasp-pi3-vc4-g++Tasuku Suzuki2019-06-041-1/+1
| | | | | | | The name was renamed in 8e445f8434f1525bce5bd4ba4b561f379b5f2cf4 Change-Id: I5a74b65309cf5dc64621db281fad3a62a2f026b1 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Turn bcm_host library into makeSpec sourceJoerg Bornemann2019-02-143-0/+13
| | | | | | | | | The bcm_host library couldn't be detected anymore. Let the makespec provide LIBDIR, INCDIR and LIBS for bcm_host to fix this. Change-Id: I4bc268504dc48edaf2884f1c14b745260fd9112c Fixes: QTBUG-73727 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix OpenGL library paths on INTEGRITY QC Snapdragon 820Kimmo Ollila2019-01-251-3/+5
| | | | | | | | | | After 521a85395da1a2728902816c072ec46bcb0ad380 configure doesn't find OpenGL libraries from QMAKE_LIBDIR, hence we use QMAKE_LIBDIR_OPENGL_ES2 and QMAKE_LIBDIR_EGL instead. Task-number: QTBUG-73136 Change-Id: Iaeac46000c5d684f601741cbef91ce745ceb4ea2 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
* mkspecs: use cross compile tools with LTCGSamuli Piippo2018-11-061-0/+4
| | | | | | | | | AR and NM have different tools when LTCG is used, override those also when cross compiling. Fixes: QTBUG-71595 Change-Id: I5347bd1874688dd89395c50ff6dd08fb1c0ebab1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Add WFD_DEVICE_CLIENT_TYPE attribute for INTEGRITY S820Am ADPKimmo Ollila2018-03-051-1/+1
| | | | | | | | | | | | | This is needed to be compatible with latest Qualcomm BSP releases. This patch also makes it possible to select HW layer via QT_OPENWFD_CLIENT_ID and QT_OPENWFD_PIPELINE_ID environment variables. Change-Id: Ie795b21afc61a1de7c1d0b52cdb30a754e3f8266 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 00f693d3e5046999270c92731e34a3e7fcd01c6b) Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* mkspec for Renesas R-Car M3Johan Klokkhammer Helsing2018-01-072-0/+57
| | | | | Change-Id: I2264d7346f15f8488d0f9ef3f7e190c6026d84e9 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10Lars Knoll2017-12-302-0/+102
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf mkspecs/win32-g++/qmake.conf src/corelib/global/qglobal_p.h src/corelib/global/qoperatingsystemversion_p.h src/corelib/io/qfilesystemengine_win.cpp src/network/bearer/qbearerengine.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/sql/doc/snippets/code/doc_src_sql-driver.cpp src/widgets/kernel/qwidget_p.h src/widgets/kernel/qwidgetwindow.cpp src/widgets/styles/qfusionstyle.cpp tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Change-Id: I80e2722f481b12fff5d967c28f89208c0e9a1dd8
| * Add mkspec for INTEGRITY Qualcomm s820 MSM8996AUKimmo Ollila2017-12-012-0/+102
| | | | | | | | | | | | Change-Id: Ia3983594d9295ae858efe2289c296cfcc2fe1b78 Reviewed-by: Rolland Dudemaine <rolland@ghs.com> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-0716-51/+136
|\| | | | | | | | | | | | | Conflicts: src/widgets/widgets/qmenu.cpp Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
| * make mkspecs not mess up -rpath-linkOswald Buddenhagen2017-05-3111-33/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding shared install paths via QMAKE_LFLAGS in the spec has the tiny side effect that they are searched _first_, which is generally a really bad idea - they should be _last_. for that purpose, introduce QMAKE_RPATHLINKDIR_POST, and migrate all specs to use it. QMAKE_RPATHDIR_POST is added for consistency, but not actually used. Task-number: QTBUG-59457 Change-Id: Iac6cda5e9111ef8cca454a69861fe8408bb40589 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * make mkspecs not mess up library and include search pathsOswald Buddenhagen2017-05-319-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | adding shared install paths to QMAKE_{INCDIR,LIBDIR} in the spec has the tiny side effect that they are searched _first_, which is generally a really bad idea - they should be _last_. for that purpose, make QMAKE_{INCDIR,LIBDIR}_POST live up to their names (i.e., search them actually last) and migrate all affected specs to use them. Task-number: QTBUG-40825 Change-Id: Ie0de81c3cc49e193186d2fedd7d6c77590c8ef79 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Add INTEGRITY mkspec for ARMv8 Drive CXTero Alamäki2017-05-292-0/+84
| | | | | | | | | | | | Change-Id: I038de7a0cc9e6046aec3fc930876d43263702e90 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Add a spec for the Asus TinkerboardLaszlo Agocs2017-04-282-0/+60
| | | | | | | | | | | | | | | | Prioritize DRM/KMS for eglfs. There are now binary drivers for Mali that enable DRM, GBM and Wayland. Change-Id: I9ac97f5006f88706854e9160bdafb82f9f8aac5c Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Adds a list of supported platforms in PI mkspecJesus Fernandez2017-04-071-2/+3
|/ | | | | Change-Id: I7e67ffc41c7a389750e1ab342a570a1dda8ff077 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* move freebsd device spec validation to configureOswald Buddenhagen2017-03-221-2/+4
| | | | | | | | amends 72efb2e6 in line with e58eb3d6f. Change-Id: I67e68e43662df6d2571579a1fed3c0f23e9416cd Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Oleksandr Tymoshenko <gonzo@bluezbox.com>
* mkspecs: Replace LGPL21 with LGPL license headerKai Koehne2017-03-032-28/+40
| | | | | | | Also use canonical contact url. Change-Id: I04c403f81bb8a8d6d6222573030d1e6d09ec4c3d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-252-4/+16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf mkspecs/common/msvc-desktop.conf mkspecs/common/msvc-version.conf mkspecs/common/winrt_winphone/qmake.conf mkspecs/features/mac/default_post.prf mkspecs/features/mac/sdk.prf mkspecs/features/qt.prf mkspecs/features/uikit/default_post.prf mkspecs/features/winrt/default_pre.prf mkspecs/winphone-arm-msvc2013/qmake.conf mkspecs/winphone-x86-msvc2013/qmake.conf mkspecs/winrt-arm-msvc2013/qmake.conf mkspecs/winrt-x64-msvc2013/qmake.conf mkspecs/winrt-x86-msvc2013/qmake.conf qmake/generators/win32/msvc_vcproj.cpp src/gui/kernel/qwindowsysteminterface.cpp src/network/kernel/qhostaddress.cpp src/plugins/platforms/mirclient/qmirclientplugin.cpp src/plugins/platforms/mirclient/qmirclientplugin.h src/widgets/util/qsystemtrayicon.cpp tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp tools/configure/Makefile.mingw tools/configure/Makefile.win32 Done-with: Jake Petroules <jake.petroules@qt.io> Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: I4be3262d3994e11929d3b1ded2c3379783797dbe
| * Fix sanity checks in DRIVE CX and Jetson K1 Pro specsLaszlo Agocs2017-01-212-4/+16
| | | | | | | | | | | | | | | | This amends e58eb3d6. Task-number: QTBUG-58287 Change-Id: Ia4b5d0cf5f71d1e0977e3c8674ef08929112f7e9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Rename ill-named RPi3 specs to match the restLaszlo Agocs2017-01-204-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Renaming these specs should cause less trouble than usual since most people are likely using the rasp-pi2 spec even for RPi3. [ChangeLog][Platform Specific Changes][Linux] The Raspberry Pi 3 device specs have been renamed from linux-rpi3-* to linux-rasp-pi3-* in order to follow the pattern of the RPi 1 and 2 specs. Change-Id: I7d1ed6a4665078af9a4cbbe4c38b5fac760d03f9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Add generic device for general cross-buildingAllan Sandfeld Jensen2016-12-212-0/+49
| | | | | | | | | | | | | | | | | | Adds linux-generic-g++ which can be used for simple cross-building to well-behaved Linux targets. Change-Id: I20423249cbcaaf7fc2c65e46b737e682d9222e38 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-168-25/+45
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure configure.pri examples/widgets/painting/fontsampler/mainwindow.cpp examples/widgets/painting/fontsampler/mainwindow.h mkspecs/features/moc.prf src/corelib/global/qglobal.h src/gui/text/qtextdocument.cpp Change-Id: Ica65512e00871695190a14ccea5c275b0165f787
| * move device spec validation to configureOswald Buddenhagen2016-12-138-25/+45
| | | | | | | | | | | | | | | | | | | | | | instead of letting the specs validate themselves on each call, let them only define a callback for use by the verifyspec configure test. this is somewhat faster, and allows them to be loaded before qdevice.pri is populated. Change-Id: I2b60d006b33bbf42c28949f10ad429520ed32f46 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Introduce CI20 mips32 mkspecMilko Leporis2016-12-052-0/+61
| | | | | | | | | | | | | | | | | | | | [ChangeLog][Platform Specific Changes][Linux] Added support for cross-compilation for the MIPS CI20. Task-number: QTBUG-57411 Change-Id: I5be2f53323b1d3c2323cd51064397590c143af1b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Add a device spec for cross-compiling for the Qt SimulatorLaszlo Agocs2016-11-242-0/+69
| | | | | | | | | | Change-Id: I6485beca158c0c81f5e33cf96d51bc88d323de2e Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Add a device spec for the Renesas R-Car H2Laszlo Agocs2016-11-162-0/+71
| | | | | | | | | | | | | | | | | | | | | | Pretty useful when working on Qt itself or just having to deploy a proper hand-crafted latest greatest to the Yocto-built image. [ChangeLog][Platform Specific Changes] Added support for cross-compilation targeting Renesas R-Car H2 (Lager) systems. Change-Id: Ie359956046b0752a6053f85b81d32550b91ce453 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Add a spec for 64-bit Jetson TX1Laszlo Agocs2016-11-052-0/+91
| | | | | | | | | | | | | | | | | | | | [ChangeLog][Platform Specific Changes] Added support for cross-compilation targeting 64-bit Jetson TX1 systems. Change-Id: I439ba0aa2424dbf448746fe2a4d26bf5596b2558 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Louai Al-Khanji <louai.al-khanji@qt.io>
* | mkspec: Add cross-compilation support for FreeBSDOleksandr Tymoshenko2016-10-126-0/+146
|/ | | | | | | | | | | Add conf files for -device qmake switch. It consists of two common pre/post includes for FreeBSD-base device. "freebsd-generic-clang" -device option for generic cross-compilation target, with bsdfb as default platform and freebsd-rasp-pi-clang option for Raspberry Pi (up to version 2) with OpenGL ES2 (eglfs) support Change-Id: I45d91c0512f60f2be438ce46e0485844c341188a Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Add a spec for NXP Colibri VF50/61Laszlo Agocs2016-09-102-0/+57
| | | | | Change-Id: I12450a214d61ffa00270095df0c77e57647d7a2c Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-161-1/+8
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/doc/src/qmake-manual.qdoc src/corelib/global/qglobal.cpp src/corelib/tools/qstring.cpp src/network/socket/qabstractsocket.cpp src/network/socket/qnativesocketengine_unix.cpp src/plugins/platforms/eglfs/api/qeglfsglobal.h Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288
| * Add X11 support for the DRIVE CXLaszlo Agocs2016-08-101-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spec, added in 5.7.0, simply defined WIN_INTERFACE_CUSTOM, leading to the generic, non-X11 typedefs for the EGL native types. This is fine for the typical embedded use, but is not what is wanted when targeting xcb, and leads to disabling EGL-on-X support. Therefore, move the define into a comon header and let the individual libs decide by defining or not defining QT_EGL_NO_X11. This sets both MESA_EGL_NO_X11_HEADERS and WIN_INTERFACE_CUSTOM in qt_egl_p.h. This way Qt builds supporting all three of eglfs (DRM+EGLDevice), wayland, and xcb (EGL) can be generated out of the box. [ChangeLog][Platform Specific Changes][Linux] xcb with EGL and OpenGL ES, as well as eglfs with the eglfs_x11 backend, are now supported on DRIVE CX boards when using the linux-drive-cx-g++ device spec. Done-with: Louai Al-Khanji <louai.al-khanji@qt.io> Task-number: QTBUG-55140 Change-Id: I6f186d16612e170995e3bca1214bcabad59af08e Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-091-1/+2
|\| | | | | | | Change-Id: I36e6b890b65d12bf6931757540bcc9c553b5eb8f
| * Add -opengl es2 to the DRIVE CX configure exampleLaszlo Agocs2016-08-081-1/+2
| | | | | | | | | | | | | | | | To make sure it does not end up picking the desktop OpenGL implementation from Mesa that may be present in the sysroot. Change-Id: I815eb7d2664f9e62d620acf8260cae40f83dfaf8 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Use pkg-config for RPi EGL detectionLaszlo Agocs2016-07-291-1/+6
| | | | | | | | | | | | | | | | | | | | The config test for eglfs-brcm would fail otherwise on modern Yocto-based sysroots, as these have no /opt/vc, but have a proper egl.pc that has the include path and libs. Task-number: QTBUG-50838 Change-Id: Ibe8dcfbfe9aabe00fd8c040e6e41a4479ccb39bb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-213-4/+81
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qsysinfo.h src/corelib/kernel/qcoreapplication_win.cpp src/gui/text/qdistancefield.cpp src/gui/text/qdistancefield_p.h src/plugins/platforms/windows/qwindowsglcontext.cpp src/plugins/platforms/windows/qwindowsglcontext.h Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-203-4/+81
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * 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>
* | | Install some eglfsdeviceintegration headers, as a private moduleGiulio Camuffo2016-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This allows external integrations to be developed against it. Also uniforms all class names as QEglFSFoo. Change-Id: I72ff37c0fcdf1ccd37110b4c36874d6c99b2e743 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | | Remove -audio-backend command line optionLars Knoll2016-05-311-2/+2
|/ / | | | | | | | | | | | | | | This option hasn't done anything for quite some time, let's get rid of it. Change-Id: Ic6f2830aaf69ba2d054ce21f0d144a61ddf5d06b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-0/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp src/network/access/qnetworkaccessmanager.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h src/widgets/widgets/qlineedit_p.cpp src/widgets/widgets/qlineedit_p.h src/winmain/winmain.pro tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp tools/configure/configureapp.cpp Change-Id: Ib9997b0d0f91946e4081d36c0c6b696c5c983b2a
| * Add notes and an example configure line to the imx6 makespecLaszlo Agocs2016-05-171-0/+17
| | | | | | | | | | | | | | | | Other popular specs have this as well. Change-Id: I44245f37857d476b9ee53ecad021261b94214b2f Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Louai Al-Khanji <louai.al-khanji@qt.io>
* | Add device mkspec for the iMX7 SOCAndy Nichols2016-05-052-0/+57
| | | | | | | | | | | | | | | | Right now there are no iMX7 SOCs available with OpenGL capable GPUs so the mkspec is very basic. Change-Id: Ia5c83eea72c4d436c774b2955ccd71f2256bfd6b Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | mkspec: Add multiarch include folder to jetson tk1 device specAndreas Holzammer2016-04-281-1/+2
| | | | | | | | | | | | | | | | | | | | Under Windows, the default paths are not correctly set, hence it's necessary to explicitly set this. Change-Id: I9779485115a93bdaf6eb6be87293ca921746bae7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-132-0/+75
|\| | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/compile.test src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/testlib/qtestcase.cpp src/testlib/qtestcase.qdoc Change-Id: Ied3c471dbc9a076c8de33d673bd557e88575609d
| * Introduce RPI3 aarch32 mkspecDonald Carr2016-04-082-0/+75
| | | | | | | | | | Change-Id: Ia76f7f5b1793a16ac17285d19429f70d722675cf Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Add some clarifying notes to the TK1 device specsLaszlo Agocs2016-03-302-2/+7
| | | | | | | | | | | | | | | | Describe the platforms better because right now the only difference is the "pro" tag which is easy to miss. Change-Id: Ia3e31ed97799bf7f8b76ee3d0bb95c7ded7692db Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* | Add device mkspec for NVIDIA Jetson TK1 development boards.Volker Krause2016-03-092-0/+71
| | | | | | | | | | | | | | | | | | Despite the very similar name and hardware, the software stack is completely different compared to the Jetson TK1 Pro we already have a mkspec for. Change-Id: I45353ece195035e961ff47df55d6361569aabb04 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Add a makespec for 64-bit Tegra X1 boardsLaszlo Agocs2016-01-293-1/+79
| | | | | | | | | | | | | | | | Which is basically same as the Jetson K1 Pro, with SDK and compiler options adjusted. Change-Id: Ic0aa8144aad12e832ae440212f6a06f52668415d Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-261-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/dbus/qdbusconnection_p.h src/dbus/qdbusintegrator.cpp src/dbus/qdbusintegrator_p.h tests/auto/corelib/io/qdir/qdir.pro tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp Change-Id: I3d3fd07aed015c74b1f545f1327aa73d5f365fcc