diff options
| author | Adam YH Lee <adam.yh.lee@gmail.com> | 2015-09-04 17:28:30 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-21 11:56:52 +0200 |
| commit | 6f0dd9f7cb4166f22b78c0813819c636f6382e4f (patch) | |
| tree | 4f179da50a054af9c93ea201f4173fc1a5d4160a /classes/qmake5_base.bbclass | |
| parent | 001ee936e9f4f3123a4f7b948bad111acdac740d (diff) | |
| download | meta-qt5-6f0dd9f7cb4166f22b78c0813819c636f6382e4f.tar.gz | |
Remove double slash when QT_DIR_NAME is empty
When `QT_DIR_NAME` is defined as an empty string (default is "qt5"),
package.bbclass will throw lots of QA warnings because now the paths contain
double slashes ("//").
We can address these warnings by explicitly defining a slash in the
variable itself.
Signed-off-by: Adam YH Lee <adam.yh.lee@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'classes/qmake5_base.bbclass')
| -rw-r--r-- | classes/qmake5_base.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index d371ff38..9ebfa08e 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
| @@ -32,7 +32,7 @@ EXTRA_OEMAKE = " \ | |||
| 32 | 32 | ||
| 33 | OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" | 33 | OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" |
| 34 | OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" | 34 | OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" |
| 35 | OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" | 35 | OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qmake" |
| 36 | OE_QMAKE_COMPILER = "${CC}" | 36 | OE_QMAKE_COMPILER = "${CC}" |
| 37 | OE_QMAKE_CC = "${CC}" | 37 | OE_QMAKE_CC = "${CC}" |
| 38 | OE_QMAKE_CFLAGS = "${CFLAGS}" | 38 | OE_QMAKE_CFLAGS = "${CFLAGS}" |