diff options
| author | axis <qt-info@nokia.com> | 2010-03-08 16:22:07 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-08 16:22:07 (GMT) |
| commit | 9a1b9728cc3a65da6646129c8422fa43ea2afed2 (patch) | |
| tree | c7892cceefaf71e45e3e2957f7d3d455954c51ee /mkspecs/common | |
| parent | 86ef6dc634ccf8518188a73262aa95b782352f20 (diff) | |
| parent | 16113ecd5135aea01aac1fa3954143e59269bd50 (diff) | |
| download | Qt-9a1b9728cc3a65da6646129c8422fa43ea2afed2.zip Qt-9a1b9728cc3a65da6646129c8422fa43ea2afed2.tar.gz Qt-9a1b9728cc3a65da6646129c8422fa43ea2afed2.tar.bz2 | |
Merge branch 'defFilesAndMisc'
Conflicts:
mkspecs/common/symbian/symbian-makefile.conf
mkspecs/symbian/features/symbian_building.prf
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/symbian/symbian-makefile.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf index ab2ef98..3801eff 100644 --- a/mkspecs/common/symbian/symbian-makefile.conf +++ b/mkspecs/common/symbian/symbian-makefile.conf @@ -13,6 +13,8 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< +QMAKE_ELF2E32_FLAGS += + include(../../common/unix.conf) QMAKE_PREFIX_SHLIB = |