diff options
author | axis <qt-info@nokia.com> | 2009-12-11 10:36:06 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2009-12-11 10:36:06 (GMT) |
commit | 2409649053279db13f829c168dccbb6da98c866b (patch) | |
tree | bcedaeed1d4a022818985d4d521c6ce9aea9e6f0 /mkspecs | |
parent | 4e523a24410deab4cd6d9eb505244a138a2d12b0 (diff) | |
download | Qt-2409649053279db13f829c168dccbb6da98c866b.zip Qt-2409649053279db13f829c168dccbb6da98c866b.tar.gz Qt-2409649053279db13f829c168dccbb6da98c866b.tar.bz2 |
Added the Qt tree to search paths.
Conflicts:
mkspecs/symbian/linux-armcc/qmake.conf
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/symbian/linux-armcc/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/symbian/linux-armcc/symbian.conf | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf index 780ff29..567bcf6 100644 --- a/mkspecs/symbian/linux-armcc/qmake.conf +++ b/mkspecs/symbian/linux-armcc/qmake.conf @@ -47,3 +47,5 @@ QMAKE_LIBS += -llibc -llibm -leuser -llibdl -llibpthread -lefsrv -llib include(../../common/unix.conf) QMAKE_PREFIX_SHLIB = + +include(symbian.conf) diff --git a/mkspecs/symbian/linux-armcc/symbian.conf b/mkspecs/symbian/linux-armcc/symbian.conf new file mode 100644 index 0000000..8b1dbea --- /dev/null +++ b/mkspecs/symbian/linux-armcc/symbian.conf @@ -0,0 +1,4 @@ +# ALL OF THIS SHOULD BE MOVED TO mkspecs/common. + +QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] +QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] |