diff options
Diffstat (limited to 'mkspecs/devices')
| -rw-r--r-- | mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp | 2 | ||||
| -rw-r--r-- | mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf | 4 | ||||
| -rw-r--r-- | mkspecs/devices/linux-rpi3-g++/qmake.conf | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp index 4dac018810..184a47b683 100644 --- a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp +++ b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "qeglfshooks.h" +#include "private/qeglfshooks_p.h" #include <EGL/fbdev_window.h> #include <stdio.h> #include <sys/ioctl.h> diff --git a/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf b/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf index 71ff90c9f8..99b8f22f97 100644 --- a/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf +++ b/mkspecs/devices/linux-arm-hisilicon-hix5hd2-g++/qmake.conf @@ -4,14 +4,14 @@ # A typical configure line looks like this: # <path-to-qt-src>/configure -opensource -confirm-license -release -make libs -make examples -optimized-qmake # -platform linux-g++-64 -device linux-arm-hisilicon-hix5hd2-g++ -device-option CROSS_COMPILE=arm-linux-gnueabihf- -# -opengl es2 -no-qml-debug -no-directfb -no-kms -no-xcb -no-alsa -no-audio-backend -qt-zlib -qt-libjpeg -qt-libpng +# -opengl es2 -no-qml-debug -no-directfb -no-kms -no-xcb -no-alsa -qt-zlib -qt-libjpeg -qt-libpng # -no-icu -no-nis -sysroot <path-to-rootfs> -extprefix <path-to-targetinstall> -hostprefix <path-to-hostinstall> # -prefix <path-to-prefix> # # such as # ./configure -opensource -confirm-license -release -make libs -make examples -optimized-qmake # -platform linux-g++-64 -device linux-arm-hisilicon-hix5hd2-g++ -device-option CROSS_COMPILE=arm-linux-gnueabihf- -# -opengl es2 -no-qml-debug -no-directfb -no-kms -no-xcb -no-alsa -no-audio-backend -qt-zlib -qt-libjpeg -qt-libpng +# -opengl es2 -no-qml-debug -no-directfb -no-kms -no-xcb -no-alsa -qt-zlib -qt-libjpeg -qt-libpng # -no-icu -no-nis -sysroot /home/abc/project/sysbase # -extprefix /home/abc/project/sysbase/qt_install # -hostprefix /home/abc/project/qtdir/qtbase_hostinstall diff --git a/mkspecs/devices/linux-rpi3-g++/qmake.conf b/mkspecs/devices/linux-rpi3-g++/qmake.conf index a660577565..10862ccd70 100644 --- a/mkspecs/devices/linux-rpi3-g++/qmake.conf +++ b/mkspecs/devices/linux-rpi3-g++/qmake.conf @@ -1,7 +1,12 @@ -# qmake configuration for the Raspberry Pi 3 (32-bit) using the Broadcom graphics stack +# qmake configuration for the Raspberry Pi 3 using the Broadcom graphics stack include(../common/linux_device_pre.conf) +# For modern Yocto-based sysroots that have the proper include and lib +# setup in egl.pc we will pull the necessary arguments from +# there. However, to support Raspbian and older stuff that has /opt/vc +# and possibly no pkg-config, have some static values as well: + # I consider it a bug that this is required, but our EGL config.test _requires_ it QMAKE_LFLAGS += -Wl,-rpath-link,$$[QT_SYSROOT]/opt/vc/lib |