From: Bart Van Assche <bvanassche@acm.org>
Date: Sat, 2 Aug 2008 09:28:39 +0000 (+0000)
Subject: Ensured that the qt4 regression tests compile with the pkg-config flags on all platforms.
X-Git-Tag: svn/VALGRIND_3_4_0~293
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43336d6753010cf8b96247c58c0146a27f8e3a8f;p=thirdparty%2Fvalgrind.git

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 8167d0c48a..88ee58c565 100644
--- 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 beb5a09627..c20b163f2c 100644
--- 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 6001d19279..2299eb0394 100644
--- 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 cb19aa4e49..5143c75bd0 100644
--- 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>