Merge topic 'cross-qt4-find-includes'
0ae8a34
Add qt4/QtCore to help find Qt headers when cross-compiling.
This commit is contained in:
commit
c2b2968825
|
@ -620,7 +620,7 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
|
||||||
SET(QT_QTCORE_INCLUDE_DIR NOTFOUND)
|
SET(QT_QTCORE_INCLUDE_DIR NOTFOUND)
|
||||||
FIND_PATH(QT_QTCORE_INCLUDE_DIR QtCore
|
FIND_PATH(QT_QTCORE_INCLUDE_DIR QtCore
|
||||||
HINTS ${qt_headers} ${QT_LIBRARY_DIR}
|
HINTS ${qt_headers} ${QT_LIBRARY_DIR}
|
||||||
PATH_SUFFIXES QtCore
|
PATH_SUFFIXES QtCore qt4/QtCore
|
||||||
)
|
)
|
||||||
|
|
||||||
# Set QT_HEADERS_DIR based on finding QtCore header
|
# Set QT_HEADERS_DIR based on finding QtCore header
|
||||||
|
|
Loading…
Reference in New Issue