[mingw-qt: 51/65] Don't set QT_LIBINFIX in the qmake.conf
epienbro
epienbro at fedoraproject.org
Tue Mar 6 21:31:02 UTC 2012
commit 8fcd6b30bff2c724b21cc23b1c8957c5a58f2418
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sun Sep 4 16:59:38 2011 +0200
Don't set QT_LIBINFIX in the qmake.conf
The qmake.conf used to build Qt-applications for Win32 (as provided by
the mingw32-qt-qmake package) contains a QT_LIBINFIX=4 parameter to
make sure that qmake can link against the correct libraries.
However, it turned out that during the build of Qt this parameter
does not need to be set. If it is, then the filenames using for the Qt
libraries get malformed. So drop the parameter from the qmake.conf used
during the build of Qt, but keep it around in mingw32-qt-qmake
qmake.conf | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/qmake.conf b/qmake.conf
index 8cce4ec..59370a6 100644
--- a/qmake.conf
+++ b/qmake.conf
@@ -108,5 +108,3 @@ QMAKE_STRIP = i686-pc-mingw32-strip
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
load(qt_config)
-
-QT_LIBINFIX = 4
More information about the scm-commits
mailing list