a6263d516d
Qt 4.8.1 is the first patch release to the 4.8 series with over 200 functional improvements to the desktop and embedded platforms. The majority of the error corrections, made primarily by Digia, have been on desktop and embedded platforms with a large number of fixes with focus on QtCore, QtGUI and QtNetwork. These fixes benefit all desktop platforms. Qt 4.8.1 also includes Mac App Store support.
27 lines
1.7 KiB
Text
27 lines
1.7 KiB
Text
$NetBSD: patch-aa,v 1.14 2012/04/09 09:12:49 adam Exp $
|
|
|
|
--- qmake/generators/unix/unixmake2.cpp.orig 2012-03-14 14:01:12.000000000 +0000
|
|
+++ qmake/generators/unix/unixmake2.cpp
|
|
@@ -244,6 +244,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")) {
|
|
@@ -1041,8 +1043,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"));
|