1ac510becc
Qt 4.7.1 is a bug-fix release. It maintains both forward and backward compatibility (source and binary) with Qt 4.7.0. For more details, refer to the online documentation included in this distribution. The documentation is also available online: http://qt.nokia.com/doc/4.7 The Qt version 4.7 series is binary compatible with the 4.6.x series. Applications compiled for 4.6 will continue to run with 4.7. Changes 4.7.0: Qt 4.7 introduces many new features and improvements as well as bugfixes over the 4.6.x series. For more details, refer to the online documentation included in this distribution. The documentation is also available online: http://qt.nokia.com/doc/4.7 The Qt version 4.7 series is binary compatible with the 4.6.x series. Applications compiled for 4.6 will continue to run with 4.7.
36 lines
2.1 KiB
Text
36 lines
2.1 KiB
Text
$NetBSD: patch-aa,v 1.12 2010/11/15 13:05:45 adam Exp $
|
|
|
|
--- qmake/generators/unix/unixmake2.cpp.orig 2010-09-10 09:04:41.000000000 +0000
|
|
+++ qmake/generators/unix/unixmake2.cpp
|
|
@@ -239,6 +239,8 @@ UnixMakefileGenerator::writeMakeParts(QT
|
|
if(!project->isEmpty("QMAKE_BUNDLE")) {
|
|
t << "TARGETD = " << escapeFilePath(var("TARGET_x.y")) << endl;
|
|
t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
|
|
+ } else if(project->isActiveConfig("compile_libtool")) {
|
|
+ t << "TARGETD = " << var("TARGET_la") << endl;
|
|
} else if(!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) {
|
|
t << "TARGETD = " << escapeFilePath(var("TARGET")) << endl;
|
|
} else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
|
|
@@ -1016,8 +1018,12 @@ void UnixMakefileGenerator::init2()
|
|
} else if (project->isActiveConfig("staticlib")) {
|
|
project->values("TARGET").first().prepend(project->first("QMAKE_PREFIX_STATICLIB"));
|
|
project->values("TARGET").first() += "." + project->first("QMAKE_EXTENSION_STATICLIB");
|
|
- if(project->values("QMAKE_AR_CMD").isEmpty())
|
|
+ if(project->values("QMAKE_AR_CMD").isEmpty()) {
|
|
+ if(project->isActiveConfig("compile_libtool"))
|
|
+ project->variables()["QMAKE_AR_CMD"].append("$(CXX) -o $(TARGET) $(OBJECTS) $(OBJMOC)");
|
|
+ else
|
|
project->values("QMAKE_AR_CMD").append("$(AR) $(TARGET) $(OBJECTS)");
|
|
+ }
|
|
} else {
|
|
project->values("TARGETA").append(project->first("DESTDIR") + project->first("QMAKE_PREFIX_STATICLIB")
|
|
+ project->first("TARGET") + "." + project->first("QMAKE_EXTENSION_STATICLIB"));
|
|
@@ -1467,7 +1473,7 @@ UnixMakefileGenerator::writePkgConfigFil
|
|
bundle = bundle.left(suffix);
|
|
pkgConfiglibName = "-framework " + bundle + " ";
|
|
} else {
|
|
- pkgConfiglibDir = "-L${libdir}";
|
|
+ pkgConfiglibDir = "-Wl,-R${libdir} -L${libdir}";
|
|
pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());
|
|
}
|
|
t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl;
|