summaryrefslogtreecommitdiffstats
path: root/qmake/Makefile.win32-g++-sh
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-11-18 13:23:03 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-11-18 14:42:58 (GMT)
commitbc09d5b11cd45e975ec745b508c703b75b019a4e (patch)
tree70deb85b696c64ad8b2e487deb5e9ae55a06a310 /qmake/Makefile.win32-g++-sh
parentdfd5ee41532b55ef6aaa5fb7ed3b586fbac80fce (diff)
downloadQt-bc09d5b11cd45e975ec745b508c703b75b019a4e.zip
Qt-bc09d5b11cd45e975ec745b508c703b75b019a4e.tar.gz
Qt-bc09d5b11cd45e975ec745b508c703b75b019a4e.tar.bz2
Resolve EPOCROOT in qt.conf using same logic as in .pro
Previously it was only possible to use EPOCROOT in qt.conf via env variable, while qmake & configure could resolve it also via devices.xml. Changed qt.conf parsing to support $${EPOCROOT} tag and use same resolving logic as qmake & configure. Task-number: QTBUG-15393 Reviewed-by: axis
Diffstat (limited to 'qmake/Makefile.win32-g++-sh')
-rw-r--r--qmake/Makefile.win32-g++-sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh
index af54288..9c7942c 100644
--- a/qmake/Makefile.win32-g++-sh
+++ b/qmake/Makefile.win32-g++-sh
@@ -25,7 +25,7 @@ CFLAGS = -c -o$@ -O \
-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_PCRE \
-DQT_NODLL -DQT_NO_STL -DQT_NO_COMPRESS -DUNICODE -DHAVE_QCONFIG_CPP \
-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
- -DQT_BOOTSTRAPPED
+ -DQT_BOOTSTRAPPED -DQLIBRARYINFO_EPOCROOT
CXXFLAGS = $(CFLAGS)
LFLAGS = -static-libgcc -static-libstdc++ -s
LIBS = -lole32 -luuid