From d09f9443b64365f845f98283ccfd7b79a2930421 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Dec 2012 21:41:03 +0100 Subject: remove pointless QT..sources references there is no point to use this for in-module references. cleaning it out in an attempt to purge the constants entirely. Change-Id: Id160b6241126717dc412d80aeaa13df3cbf8fa17 Reviewed-by: Joerg Bornemann --- tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro | 8 ++++---- tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro | 12 ++++++------ tests/auto/unit/qmediaplaylist/qmediaplaylist.pro | 6 +++--- tests/auto/unit/qwavedecoder/qwavedecoder.pro | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro index 756ba3f68..37c5fd33f 100644 --- a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro +++ b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro @@ -5,12 +5,12 @@ QT += multimedia-private qml testlib CONFIG += no_private_qt_headers_warning HEADERS += \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio_p.h \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediametadata_p.h + ../../../../src/imports/multimedia/qdeclarativeaudio_p.h \ + ../../../../src/imports/multimedia/qdeclarativemediametadata_p.h SOURCES += \ tst_qdeclarativeaudio.cpp \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativeaudio.cpp + ../../../../src/imports/multimedia/qdeclarativeaudio.cpp -INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia +INCLUDEPATH += ../../../../src/imports/multimedia DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro index c9435ea7f..2ab722c71 100644 --- a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro +++ b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro @@ -5,15 +5,15 @@ QT += multimedia-private qml testlib CONFIG += no_private_qt_headers_warning HEADERS += \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativevideo_p.h \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase_p.h \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediametadata_p.h + ../../../../src/imports/multimedia/qdeclarativevideo_p.h \ + ../../../../src/imports/multimedia/qdeclarativemediabase_p.h \ + ../../../../src/imports/multimedia/qdeclarativemediametadata_p.h SOURCES += \ tst_qdeclarativevideo.cpp \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativevideo.cpp \ - $$QT.multimedia.sources/../imports/multimedia/qdeclarativemediabase.cpp + ../../../../src/imports/multimedia/qdeclarativevideo.cpp \ + ../../../../src/imports/multimedia/qdeclarativemediabase.cpp -INCLUDEPATH += $$QT.multimedia.sources/../imports/multimedia +INCLUDEPATH += ../../../../src/imports/multimedia QT+=widgets DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro index 16618eaa4..ed54c478c 100644 --- a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro +++ b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro @@ -7,13 +7,13 @@ QT += multimedia-private testlib CONFIG += no_private_qt_headers_warning HEADERS += \ - $$QT.multimedia.sources/../plugins/m3u/qm3uhandler.h + ../../../../src/plugins/m3u/qm3uhandler.h SOURCES += \ tst_qmediaplaylist.cpp \ - $$QT.multimedia.sources/../plugins/m3u/qm3uhandler.cpp + ../../../../src/plugins/m3u/qm3uhandler.cpp -INCLUDEPATH += $$QT.multimedia.sources/../plugins/m3u +INCLUDEPATH += ../../../../src/plugins/m3u TESTDATA += testdata/* DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/unit/qwavedecoder/qwavedecoder.pro b/tests/auto/unit/qwavedecoder/qwavedecoder.pro index 18e74db0a..1b6af7e86 100644 --- a/tests/auto/unit/qwavedecoder/qwavedecoder.pro +++ b/tests/auto/unit/qwavedecoder/qwavedecoder.pro @@ -1,7 +1,7 @@ TARGET = tst_qwavedecoder -HEADERS += $$QT.multimedia.sources/audio/qwavedecoder_p.h +HEADERS += ../../../../src/multimedia/audio/qwavedecoder_p.h SOURCES += tst_qwavedecoder.cpp \ - $$QT.multimedia.sources/audio/qwavedecoder_p.cpp + ../../../../src/multimedia/audio/qwavedecoder_p.cpp QT += multimedia-private testlib network CONFIG += no_private_qt_headers_warning testcase -- cgit v1.2.3