Commit b5f78bb04bea15bb1042c4b95647e4a20dd09d80
Remove static vs dynamic library autodetection from qmake in Symbian
Autodetection was unreliable and there was no practical way to make
it reliable even for common cases, so it was removed.
Task-number: QTBUG-13498
Reviewed-by: Janne Koskinen
| |   |
| 706 | 706 | if (lib.startsWith("-l")) { |
| 707 | 707 | lib.remove(0, 2); |
| 708 | 708 | QString mmpStatement; |
| if (lib.endsWith(".dll")) { |
| if (lib.endsWith(".lib")) { |
| 710 | 710 | lib.chop(4); |
| mmpStatement = "LIBRARY\t\t"; |
| } else if (lib.endsWith(".lib")) { |
| lib.chop(4); |
| 714 | 711 | mmpStatement = "STATICLIBRARY\t"; |
| 715 | 712 | } else { |
| // Hacky way to find out what kind of library it is. Check the |
| // ARMV5 build directory for library type. We default to shared |
| // library, since that is more common. |
| QString udebStaticLibLocation(epocRoot()); |
| QString urelStaticLibLocation(udebStaticLibLocation); |
| udebStaticLibLocation += QString("epoc32/release/armv5/udeb/%1.lib").arg(lib); |
| urelStaticLibLocation += QString("epoc32/release/armv5/urel/%1.lib").arg(lib); |
| if (QFile::exists(udebStaticLibLocation) || QFile::exists(urelStaticLibLocation)) { |
| mmpStatement = "STATICLIBRARY\t"; |
| } else { |
| mmpStatement = "LIBRARY\t\t"; |
| } |
| if (lib.endsWith(".dll")) |
| lib.chop(4); |
| mmpStatement = "LIBRARY\t\t"; |
| 728 | 716 | } |
| 729 | 717 | t << mmpStatement << lib << ".lib" << endl; |
| 730 | 718 | } |