21 lines
683 B
Diff
21 lines
683 B
Diff
|
--- qwt-6.0.2/qwtbuild.pri.orig 2013-01-11 04:23:05.001149320 +0100
|
||
|
|
+++ qwt-6.0.2/qwtbuild.pri 2013-01-11 04:23:15.355436864 +0100
|
||
|
|
@@ -64,17 +64,3 @@
|
||
|
|
!debug_and_release {
|
||
|
|
OBJECTS_DIR = obj
|
||
|
|
}
|
||
|
|
-
|
||
|
|
-unix {
|
||
|
|
-
|
||
|
|
- exists( $${QMAKE_LIBDIR_QT}/libqwt.so ) {
|
||
|
|
-
|
||
|
|
- # 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.*" )
|
||
|
|
- }
|
||
|
|
-}
|