Ensured that the qt4 regression tests compile with the pkg-config flags on all platforms.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8502

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 8167d0c48aae11e2aa7d365c96f368423995f4db..88ee58c565fc7f94d5559bcd192f6e1053cf5362 100644 (file)
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -319,13 +319,16 @@ pth_spinlock_LDADD          = -lpthread
 
 if HAVE_QTCORE
 qt4_mutex_SOURCES           = qt4_mutex.cpp
-qt4_mutex_LDADD             = -lQtCore -lpthread
+qt4_mutex_CXXFLAGS          = $(AM_CXXFLAGS) $(QTCORE_CFLAGS)
+qt4_mutex_LDADD             = $(QTCORE_LIBS)
 
 qt4_rwlock_SOURCES          = qt4_rwlock.cpp
-qt4_rwlock_LDADD            = -lQtCore -lpthread
+qt4_rwlock_CXXFLAGS         = $(AM_CXXFLAGS) $(QTCORE_CFLAGS)
+qt4_rwlock_LDADD            = $(QTCORE_LIBS)
 
 qt4_semaphore_SOURCES       = qt4_semaphore.cpp
-qt4_semaphore_LDADD         = -lQtCore -lpthread
+qt4_semaphore_CXXFLAGS      = $(AM_CXXFLAGS) $(QTCORE_CFLAGS)
+qt4_semaphore_LDADD         = $(QTCORE_LIBS)
 endif
 
 recursive_mutex_SOURCES     = recursive_mutex.c

diff --git a/drd/tests/qt4_mutex.cpp b/drd/tests/qt4_mutex.cpp
index beb5a09627521cdae481895ae51b2592882acd95..c20b163f2c66204c99e3a7a1184c256692ecb7ed 100644 (file)
--- a/drd/tests/qt4_mutex.cpp
+++ b/drd/tests/qt4_mutex.cpp
@@ -5,8 +5,8 @@
 #endif
 
 #include "config.h"
-#include <QtCore/QMutex>  // class QMutex
-#include <QtCore/QThread> // class QThread
+#include <QMutex>         // class QMutex
+#include <QThread>        // class QThread
 #include <cassert>
 #include <cstdio>         // fprintf()
 #include <cstdlib>        // atoi()

diff --git a/drd/tests/qt4_rwlock.cpp b/drd/tests/qt4_rwlock.cpp
index 6001d192795cb1d4b4b0a0f0f5bbd38f03e1e71c..2299eb0394fe7c59c69ae6b22cbf7f5667fadd11 100644 (file)
--- a/drd/tests/qt4_rwlock.cpp
+++ b/drd/tests/qt4_rwlock.cpp
@@ -4,8 +4,8 @@
 #define _GNU_SOURCE
 #endif
 
-#include <QtCore/QThread>        // class QThread
-#include <QtCore/QReadWriteLock> // class QReadWriteLock
+#include <QThread>               // class QThread
+#include <QReadWriteLock>        // class QReadWriteLock
 #include <cstdio>                // fprintf()
 #include <cstdlib>               // atoi()
 #include <new>

diff --git a/drd/tests/qt4_semaphore.cpp b/drd/tests/qt4_semaphore.cpp
index cb19aa4e498bb65a5584fca13a3e277e1443c8f9..5143c75bd0f2d3228d6b9c55f46812a96568f2f3 100644 (file)
--- a/drd/tests/qt4_semaphore.cpp
+++ b/drd/tests/qt4_semaphore.cpp
@@ -4,8 +4,8 @@
 #define _GNU_SOURCE
 #endif
 
-#include <QtCore/QThread>    // class QMutex
-#include <QtCore/QSemaphore> // class QSemaphore
+#include <QThread>           // class QMutex
+#include <QSemaphore>        // class QSemaphore
 #include <cstdio>            // fprintf()
 #include <cstdlib>           // atoi()
 #include <new>