diff options
| author | Philip A Reimer | 2015-09-12 11:46:36 -0600 |
|---|---|---|
| committer | Philip A Reimer | 2015-09-12 11:46:36 -0600 |
| commit | 5aa3a2f747948a03e9ba9e1312db49d4d91609af (patch) | |
| tree | b3c194b5ed639e0c819d2280b5b277cc1631bed6 /qt5-qmake-implib-dll-a.patch | |
| parent | 0618eb9e56cccbea0a8269460efb9d27bca4d523 (diff) | |
| download | aur-5aa3a2f747948a03e9ba9e1312db49d4d91609af.tar.gz | |
Update to 5.5.0
Diffstat (limited to 'qt5-qmake-implib-dll-a.patch')
| -rw-r--r-- | qt5-qmake-implib-dll-a.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qt5-qmake-implib-dll-a.patch b/qt5-qmake-implib-dll-a.patch index dbef279810a2..91ef32a16664 100644 --- a/qt5-qmake-implib-dll-a.patch +++ b/qt5-qmake-implib-dll-a.patch @@ -1,6 +1,6 @@ --- a/qmake/generators/win32/mingw_make.cpp 2013-08-25 13:04:06.000000000 -0500 +++ b/qmake/generators/win32/mingw_make.cpp 2014-01-02 01:24:31.640046700 -0600 -@@ -71,7 +71,7 @@ QString MingwMakefileGenerator::escapeDe +@@ -58,7 +58,7 @@ QString MingwMakefileGenerator::getLibTarget() { @@ -8,14 +8,14 @@ + return QString("lib" + project->first("TARGET") + project->first("TARGET_VERSION_EXT") + ".dll.a"); } - bool MingwMakefileGenerator::findLibraries() -@@ -268,7 +268,7 @@ + QString MingwMakefileGenerator::getManifestFileForRcFile() const +@@ -250,7 +250,7 @@ if(!project->first("DESTDIR").isEmpty()) destDir = Option::fixPathToTargetOS(project->first("DESTDIR") + Option::dir_sep, false, false); project->values("MINGW_IMPORT_LIB").prepend(destDir + "lib" + project->first("TARGET") - + project->first("TARGET_VERSION_EXT") + ".a"); + + project->first("TARGET_VERSION_EXT") + ".dll.a"); - project->values("QMAKE_LFLAGS").append(QString("-Wl,--out-implib,") + project->first("MINGW_IMPORT_LIB")); + project->values("QMAKE_LFLAGS").append(QString("-Wl,--out-implib,") + fileVar("MINGW_IMPORT_LIB")); } --- a/mkspecs/features/create_cmake.prf.cmake 2013-10-22 10:49:28.000000000 +0200 |