diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-13 00:22:08 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-13 00:22:08 (GMT) |
| commit | abb70694334a770d4acb0ec607bb9b02defd1204 (patch) | |
| tree | 52e8a3a105f76c882967704a4244f7bc585ecdd9 | |
| parent | aa541b875bbaa514d90a5fa9ea6119e8a525db55 (diff) | |
| download | Qt-abb70694334a770d4acb0ec607bb9b02defd1204.zip Qt-abb70694334a770d4acb0ec607bb9b02defd1204.tar.gz Qt-abb70694334a770d4acb0ec607bb9b02defd1204.tar.bz2 | |
Use local includes, not those in Qt. It matters when Declarative is a module
installed after Qt.
| -rw-r--r-- | src/declarative/declarative.pro | 2 | ||||
| -rw-r--r-- | src/qbase.pri | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index e5e604b..e4901bf 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -12,6 +12,8 @@ unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtXml # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage # LIBS += -lgcov +INCLUDEPATH += ../../include/QtDeclarative + include(../qbase.pri) #modules diff --git a/src/qbase.pri b/src/qbase.pri index 6428130..b9c8c06 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -1,5 +1,5 @@ isEmpty(TARGET):error(You must set TARGET before include()'ing $${_FILE_}) -INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat +!equals(TARGET, QtDeclarative): contains():INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat !isEmpty(RCC_DIR): INCLUDEPATH += $$RCC_DIR isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700 TEMPLATE = lib |