diff options
| author | Francois Andriot <albator78@libertysurf.fr> | 2014-09-12 12:57:56 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-09-12 13:01:39 -0500 |
| commit | b716176cec88f5fa604b637a947b44b9ff165d5a (patch) | |
| tree | 72177722906e1c4afc03bcc57b30cdbad5dd8f60 /qmake/generators/unix/unixmake.cpp | |
| parent | e17513956503963f4d468342a5be6a0967aca97c (diff) | |
| download | qt3-b716176cec88f5fa604b637a947b44b9ff165d5a.tar.gz qt3-b716176cec88f5fa604b637a947b44b9ff165d5a.zip | |
Fix qmake shared library naming
Add long long int support to TQTextStream
Fix potential segmentation fault in QValueList
Fix library naming in TQT Plugins
This relates to Bug 2107
Diffstat (limited to 'qmake/generators/unix/unixmake.cpp')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index e863495..865c84a 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -806,7 +806,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t) uninst.append("\n\t"); uninst.append("-$(DEL_FILE) \"" + dst_pc + "\""); } - if ( project->isEmpty("QMAKE_CYGWIN_SHLIB") ) { + if ( project->isEmpty("QMAKE_CYGWIN_SHLIB") && project->isEmpty("QMAKE_OPENBSD_SHLIBS") ) { if ( !project->isActiveConfig("staticlib") && !project->isActiveConfig("plugin") ) { if ( project->isEmpty("QMAKE_HPUX_SHLIB") ) { links << "$(TARGET0)" << "$(TARGET1)" << "$(TARGET2)"; |