43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From ea69978fbb9dcb8b63c46a3a1e36821359bb86ee Mon Sep 17 00:00:00 2001
|
|
From: Evan Nguyen <evan.nguyen@nokia.com>
|
|
Date: Wed, 9 Jun 2010 14:47:56 +1000
|
|
Subject: [PATCH 1/1] removed the use of qimportbase.pri for QML plugin
|
|
|
|
---
|
|
plugins/declarative/multimedia/multimedia.pro | 9 ++++-----
|
|
1 files changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/plugins/declarative/multimedia/multimedia.pro b/plugins/declarative/multimedia/multimedia.pro
|
|
index 7ee4f66..4834a5a 100644
|
|
--- a/plugins/declarative/multimedia/multimedia.pro
|
|
+++ b/plugins/declarative/multimedia/multimedia.pro
|
|
@@ -1,13 +1,13 @@
|
|
-include(../../../staticconfig.pri)
|
|
-
|
|
INCLUDEPATH += ../../../src/multimedia \
|
|
../../../src/multimedia/effects \
|
|
../../../src/multimedia/video
|
|
INCLUDEPATH += ../../../src/global
|
|
|
|
-TARGET = declarative_multimedia
|
|
+TARGET = $$qtLibraryTarget(declarative_multimedia)
|
|
+TEMPLATE = lib
|
|
+CONFIG += plugin
|
|
TARGETPATH = Qt/multimedia
|
|
-include(../../qimportbase.pri)
|
|
+PLUGIN_TYPE = declarative
|
|
include(../../../common.pri)
|
|
|
|
QT += declarative
|
|
@@ -28,7 +28,6 @@ SOURCES += \
|
|
CONFIG += mobility
|
|
MOBILITY += multimedia
|
|
|
|
-DESTDIR = $$[QT_INSTALL_PREFIX]/imports/$$TARGETPATH
|
|
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
|
|
|
|
qmldir.files += $$PWD/qmldir
|
|
--
|
|
1.7.0.1
|
|
|