diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-28 13:00:53 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-28 15:55:09 +0200 |
| commit | 40cf08634741494df0c66fdfb151613b7ae29803 (patch) | |
| tree | 64714c99d4730ee0ea4f7ad2d265ea43c7ee7c5b /recipes-qt | |
| parent | 783c97966478c6353fddb34f42044317d1355043 (diff) | |
| download | meta-qt5-40cf08634741494df0c66fdfb151613b7ae29803.tar.gz | |
qtbase: Remove QT_DIR_NAME, QT_BASE_NAME
* QT_DIR_NAME is set in qmake5_base
* QT_BASE_NAME isn't used
Diffstat (limited to 'recipes-qt')
| -rw-r--r-- | recipes-qt/qt5/qtbase-native.inc | 1 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase.inc | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index c6821641..5f88130d 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc | |||
| @@ -10,7 +10,6 @@ inherit native qmake5_base | |||
| 10 | QT_MODULE = "qtbase" | 10 | QT_MODULE = "qtbase" |
| 11 | 11 | ||
| 12 | SSTATE_SCAN_FILES += "*.pri *.prl" | 12 | SSTATE_SCAN_FILES += "*.pri *.prl" |
| 13 | QT_DIR_NAME ?= "qt5" | ||
| 14 | 13 | ||
| 15 | SRC_URI += " \ | 14 | SRC_URI += " \ |
| 16 | file://0001-Add-linux-oe-g-platform.patch \ | 15 | file://0001-Add-linux-oe-g-platform.patch \ |
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 6cc4e9d4..a5ac60cb 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc | |||
| @@ -27,9 +27,6 @@ QT_MODULE_FLAGS = "-no-xcb" | |||
| 27 | 27 | ||
| 28 | INC_PR = "r0" | 28 | INC_PR = "r0" |
| 29 | 29 | ||
| 30 | QT_BASE_NAME = "qt5" | ||
| 31 | QT_DIR_NAME = "qt5" | ||
| 32 | |||
| 33 | SSTATE_SCAN_FILES += "*.pri *.prl" | 30 | SSTATE_SCAN_FILES += "*.pri *.prl" |
| 34 | 31 | ||
| 35 | # Qt uses atomic instructions not supported in thumb mode | 32 | # Qt uses atomic instructions not supported in thumb mode |