diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-06-03 10:11:46 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-06-03 10:11:46 +0300 |
| commit | 2746cdba75f411541d80ddfd5cadad2753fe29d3 (patch) | |
| tree | 71b5e49cd3dbe1179a2ff866ee6b7cc0e7fbbd92 /classes | |
| parent | 6bd7ab491793d92f0942d9d8726873a514302849 (diff) | |
| parent | 27617dde3560e2fe97989670725eb19747a0f48d (diff) | |
Merge remote-tracking branch 'meta-qt5/master' into 5.7
* meta-qt5/master:
qtchooser: add new recipe
qtvirtualkeyboard: add recipe
qtdeclarative-render2d: add recipe
qtdatavis3d: add recipe
qtcharts: add recipe
licenses: update technology preview license to match upstream
cmake_qt5: prepend the Qt5 specific CMake variables to EXTRA_OECMAKE
qtbase: add patch to make Qt5Config modules behave better with cmake builds
qt5: Allow disabling SHA validation for branch
qtbase: Reorder EGL libraries from pkgconfig and defaults:
Change-Id: If0804ddb8c506e6f0d1ec32251cca6620dd97abe
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/cmake_qt5.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass index 813ea0c9..4dc897bb 100644 --- a/classes/cmake_qt5.bbclass +++ b/classes/cmake_qt5.bbclass @@ -3,7 +3,7 @@ inherit qmake5_paths DEPENDS_prepend = "qtbase " -EXTRA_OECMAKE += " \ +EXTRA_OECMAKE_prepend = " \ -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \ -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \ -DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \ |