diff options
author | axis <qt-info@nokia.com> | 2011-01-31 11:37:19 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2011-01-31 11:37:19 (GMT) |
commit | 5cd39cd8a70be4c22164fe060ad64a1d9108bf41 (patch) | |
tree | 4b072c7d4e4d717fe8f0977dd2108837ac71f7c3 /src/multimedia/multimedia.pro | |
parent | c40ae86025856225e74289249ecc509bf61dc9ba (diff) | |
parent | 9c132451acc7fbed1611fd3676cceb26e815f50d (diff) | |
download | Qt-5cd39cd8a70be4c22164fe060ad64a1d9108bf41.zip Qt-5cd39cd8a70be4c22164fe060ad64a1d9108bf41.tar.gz Qt-5cd39cd8a70be4c22164fe060ad64a1d9108bf41.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master
Diffstat (limited to 'src/multimedia/multimedia.pro')
-rw-r--r-- | src/multimedia/multimedia.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 852322d..e827cdd 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -4,7 +4,7 @@ QT = core gui DEFINES += QT_BUILD_MULTIMEDIA_LIB QT_NO_USING_NAMESPACE -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui include(../qbase.pri) |