[Valgrind-developers] valgrind: r8502 - trunk/drd/tests

[<sv...@va...>]

Author: bart
Date: 2008-08-02 10:28:39 +0100 (Sat, 02 Aug 2008)
New Revision: 8502

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

Modified:
   trunk/drd/tests/Makefile.am
   trunk/drd/tests/qt4_mutex.cpp
   trunk/drd/tests/qt4_rwlock.cpp
   trunk/drd/tests/qt4_semaphore.cpp


Modified: trunk/drd/tests/Makefile.am
===================================================================
--- trunk/drd/tests/Makefile.am	2008-08-02 09:08:17 UTC (rev 8501)
+++ trunk/drd/tests/Makefile.am	2008-08-02 09:28:39 UTC (rev 8502)
@@ -319,13 +319,16 @@
 
 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

Modified: trunk/drd/tests/qt4_mutex.cpp
===================================================================
--- trunk/drd/tests/qt4_mutex.cpp	2008-08-02 09:08:17 UTC (rev 8501)
+++ trunk/drd/tests/qt4_mutex.cpp	2008-08-02 09:28:39 UTC (rev 8502)
@@ -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()

Modified: trunk/drd/tests/qt4_rwlock.cpp
===================================================================
--- trunk/drd/tests/qt4_rwlock.cpp	2008-08-02 09:08:17 UTC (rev 8501)
+++ trunk/drd/tests/qt4_rwlock.cpp	2008-08-02 09:28:39 UTC (rev 8502)
@@ -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>

Modified: trunk/drd/tests/qt4_semaphore.cpp
===================================================================
--- trunk/drd/tests/qt4_semaphore.cpp	2008-08-02 09:08:17 UTC (rev 8501)
+++ trunk/drd/tests/qt4_semaphore.cpp	2008-08-02 09:28:39 UTC (rev 8502)
@@ -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>