From 3408abef86f49b0d2bd5de7f8dcf24a125166242 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Feb 2016 16:25:16 +0100 Subject: rely on the automatically defined QT_BUILD_*_LIB Change-Id: I8c1c755270aa0a703103925656f7c1b555e4db1f Reviewed-by: Yoann Lopes --- .../qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h | 2 +- src/qtmultimediaquicktools/qtmultimediaquicktools.pro | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h b/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h index ac8f0ac71..0421e6cb9 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h +++ b/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h @@ -48,7 +48,7 @@ #include #ifndef QT_STATIC -# if defined(QT_BUILD_QTMM_QUICK_LIB) +# if defined(QT_BUILD_QTMULTIMEDIAQUICKTOOLS_LIB) # define Q_MULTIMEDIAQUICK_EXPORT Q_DECL_EXPORT # else # define Q_MULTIMEDIAQUICK_EXPORT Q_DECL_IMPORT diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro index 0a5110f59..e1425c3ec 100644 --- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro +++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro @@ -1,9 +1,8 @@ TARGET = QtMultimediaQuick_p + QT = core quick multimedia-private CONFIG += internal_module -DEFINES += QT_BUILD_QTMM_QUICK_LIB - # Header files must go inside source directory of a module # to be installed by syncqt. INCLUDEPATH += ../multimedia/qtmultimediaquicktools_headers/ -- cgit v1.2.1