--- qwtbuild.pri.orig +++ qwtbuild.pri @@ -14,7 +14,6 @@ CONFIG += qt CONFIG += warn_on CONFIG += no_keywords -CONFIG += silent ###################################################################### # release/debug mode @@ -32,7 +31,7 @@ } else { - CONFIG += release + CONFIG += @ARCHES@ release VER_MAJ = $${QWT_VER_MAJ} VER_MIN = $${QWT_VER_MIN} @@ -65,17 +64,3 @@ !debug_and_release { OBJECTS_DIR = obj } - -unix { - - exists( $${QMAKE_LIBDIR_QT}/libqwt.* ) { - - # On some Linux distributions the Qwt libraries are installed - # in the same directory as the Qt libraries. Unfortunately - # qmake always adds QMAKE_LIBDIR_QT at the beginning of the - # linker path, so that the installed libraries will be - # used instead of the local ones. - - error( "local build will conflict with $${QMAKE_LIBDIR_QT}/libqwt.*" ) - } -}