diff options
| author | Pasi Pentikainen <pasi.a.pentikainen@nokia.com> | 2011-11-13 01:58:26 +0200 |
|---|---|---|
| committer | Pasi Pentikainen <pasi.a.pentikainen@nokia.com> | 2011-11-14 17:09:20 +0200 |
| commit | d33a6d7f2d18aa1e627bedd4bbba5eed350ef783 (patch) | |
| tree | a117d96219f10ce14f8098c6e5462dfe1226e94a /config.profiles | |
| parent | 120199e1ba102fb294e580b2905e370c15ebf2d0 (diff) | |
Fix linux-symbian cross-compilation configure-phase for platform builing
When building Symbian platform itself, the lower layer libraries are not
available on configure phase, and the config.test build scripts fail,
creating false "NO"-flags (also config.test currently does not work with
Symbian raptor). This fix aligns the configure results of configure-sh-
script with configure.exe as far as possible and fixes couple of symbian
cross-compilation configure issues, as detailed below:
Configure sh-script:
- Disable configure tests with symbian-sbsv2 where the failing test
would result to invalid disable-flags
- Skip applying of X11/Unix/Mac specific QCONFIG disable-flags that
are not produced by configure.exe either
- Fix emitting of "QT_NO_GUI" flag (in all environments)
qtconfigure.flm:
- Copy mkspecs as files to /epoc32/... instead of symbolic link
Reviewed-by: Miikka Heikkinen
Task-number: QTBUG-14361
Diffstat (limited to 'config.profiles')
| -rw-r--r-- | config.profiles/symbian/qtconfig.flm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.profiles/symbian/qtconfig.flm b/config.profiles/symbian/qtconfig.flm index 90751646b0..7a31c6641c 100644 --- a/config.profiles/symbian/qtconfig.flm +++ b/config.profiles/symbian/qtconfig.flm @@ -63,7 +63,7 @@ $(SOURCEDIR)/qmake$(DOTEXE): $(EXTENSION_ROOT)/$(QT_ROOT)/$(CONFIGURE_APP) perl headerexport -base-dir $(EXTENSION_ROOT)/$(QT_ROOT) -outdir $(EPOCROOT)/epoc32/include/ -what $(SOURCEDIR)/qtconfig_what.log $(call endrule,headerexport) $(call startrule,mkspecexport) \ - $(GNUCP) -R $(EXTENSION_ROOT)/$(QT_ROOT)/mkspecs $(MKSPECDIR) + $(GNUCP) -R -L $(EXTENSION_ROOT)/$(QT_ROOT)/mkspecs $(MKSPECDIR) $(GNUFIND) $(EXTENSION_ROOT)/$(QT_ROOT)/mkspecs -type f | \ $(GNUSED) 's!$(EXTENSION_ROOT)/$(QT_ROOT)/!$(MKSPECDIR)/!' >> $(SOURCEDIR)/qtconfig_what.log \ $(call endrule,mkspecexport) |