diff options
| author | axis <qt-info@nokia.com> | 2011-01-07 06:53:13 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-03-04 10:43:50 (GMT) |
| commit | 7dacac5ad465fe5c3aea8e2e09d7910a1ed58079 (patch) | |
| tree | f21099c61dc3723737cdc91bfcb3ffc4e7c614d3 /qmake | |
| parent | 775f98e2fe20cf381f9df3a4ff3aca3910c7d05c (diff) | |
| download | Qt-7dacac5ad465fe5c3aea8e2e09d7910a1ed58079.zip Qt-7dacac5ad465fe5c3aea8e2e09d7910a1ed58079.tar.gz Qt-7dacac5ad465fe5c3aea8e2e09d7910a1ed58079.tar.bz2 | |
Avoided some MinGW specific codepaths when building Symbian libs.
RevBy: Trust me
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 4 | ||||
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index fc8cfa0..a772b38 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -290,7 +290,7 @@ void MingwMakefileGenerator::init() if(configs.indexOf("qt") == -1) configs.append("qt"); - if(project->isActiveConfig("dll")) { + if(project->isActiveConfig("dll") && project->values("QMAKE_SYMBIAN_SHLIB").isEmpty()) { QString destDir = ""; if(!project->first("DESTDIR").isEmpty()) destDir = Option::fixPathToTargetOS(project->first("DESTDIR") + Option::dir_sep, false, false); @@ -299,7 +299,7 @@ void MingwMakefileGenerator::init() project->values("QMAKE_LFLAGS").append(QString("-Wl,--out-implib,") + project->first("MINGW_IMPORT_LIB")); } - if(!project->values("DEF_FILE").isEmpty()) + if(!project->values("DEF_FILE").isEmpty() && project->values("QMAKE_SYMBIAN_SHLIB").isEmpty()) project->values("QMAKE_LFLAGS").append(QString("-Wl,") + project->first("DEF_FILE")); MakefileGenerator::init(); diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index d92eb69..f2bf7d4 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -303,7 +303,8 @@ void Win32MakefileGenerator::processVars() // TARGET_VERSION_EXT will be used to add a version number onto the target name if (project->values("TARGET_VERSION_EXT").isEmpty() - && !project->values("VER_MAJ").isEmpty()) + && !project->values("VER_MAJ").isEmpty() + && project->values("QMAKE_SYMBIAN_SHLIB").isEmpty()) project->values("TARGET_VERSION_EXT").append(project->values("VER_MAJ").first()); if(project->isEmpty("QMAKE_COPY_FILE")) |