diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-20 13:46:21 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-23 21:09:46 +0200 |
| commit | 56d6e000f7487c59172330ebd23a718268c508f1 (patch) | |
| tree | 1494432583b1569816075091a8075b31d795f77c /config.tests/qpa | |
| parent | 9fd407fc6a29c94b4568dd042a05c208255179e0 (diff) | |
| parent | c276aa51303b7c6f8e4cd854aadf8344a906e50f (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
mkspecs/wince80colibri-armv7-msvc2012/qmake.conf
qmake/generators/win32/msvc_vcproj.cpp
src/corelib/global/qnamespace.h
src/corelib/global/qnamespace.qdoc
src/corelib/io/qfsfileengine_win.cpp
src/corelib/tools/tools.pri
src/network/ssl/qsslconfiguration_p.h
src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
src/plugins/platforms/windows/windows.pri
src/src.pro
src/tools/bootstrap/bootstrap.pro
src/tools/uic/cpp/cppwriteinitialization.cpp
src/widgets/dialogs/qfilesystemmodel.cpp
tests/auto/testlib/selftests/expected_cmptest.teamcity
tests/auto/testlib/selftests/expected_cmptest.txt
Change-Id: I4d2ac78f0dcc97f008186bbbc769c6fe588ab0e5
Diffstat (limited to 'config.tests/qpa')
| -rw-r--r-- | config.tests/qpa/eglfs-viv/eglfs-viv.cpp | 4 | ||||
| -rw-r--r-- | config.tests/qpa/kms/kms.pro | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config.tests/qpa/eglfs-viv/eglfs-viv.cpp b/config.tests/qpa/eglfs-viv/eglfs-viv.cpp index a41c482b67..96935a2aa0 100644 --- a/config.tests/qpa/eglfs-viv/eglfs-viv.cpp +++ b/config.tests/qpa/eglfs-viv/eglfs-viv.cpp @@ -43,6 +43,8 @@ int main(int, char **) { - fbGetDisplay(); + // Do not rely on fbGetDisplay() since the signature has changed over time. + // Stick to fbGetDisplayByIndex(). + fbGetDisplayByIndex(0); return 0; } diff --git a/config.tests/qpa/kms/kms.pro b/config.tests/qpa/kms/kms.pro index 1fb73677e7..5147bc82da 100644 --- a/config.tests/qpa/kms/kms.pro +++ b/config.tests/qpa/kms/kms.pro @@ -1,4 +1,4 @@ SOURCES = kms.cpp CONFIG += link_pkgconfig -PKGCONFIG += libdrm libudev +PKGCONFIG += libdrm CONFIG -= qt |