40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 7d8c5ed8f18ddd669f8f6c4d3ac7e74f6e06e9f0 Mon Sep 17 00:00:00 2001
|
|
From: Alex <qt-info@nokia.com>
|
|
Date: Wed, 9 Jun 2010 13:54:59 +1000
|
|
Subject: [PATCH 1/1] remove need for qimportbase.pri
|
|
(cherry picked from commit d80a5a89763d561ba9b704da7cd5f7fd5890cdbf)
|
|
|
|
---
|
|
.../serviceframework/serviceframework.pro | 7 ++++---
|
|
1 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/plugins/declarative/serviceframework/serviceframework.pro b/plugins/declarative/serviceframework/serviceframework.pro
|
|
index 0682b87..5b8fcd4 100644
|
|
--- a/plugins/declarative/serviceframework/serviceframework.pro
|
|
+++ b/plugins/declarative/serviceframework/serviceframework.pro
|
|
@@ -1,9 +1,11 @@
|
|
INCLUDEPATH += ../../../src/serviceframework
|
|
INCLUDEPATH += ../../../src/global
|
|
|
|
-TARGET = declarative_serviceframework
|
|
+TARGET = $$qtLibraryTarget(declarative_serviceframework)
|
|
+TEMPLATE = lib
|
|
+CONFIG += plugin
|
|
TARGETPATH = QtMobility/serviceframework
|
|
-include(../../qimportbase.pri)
|
|
+PLUGIN_TYPE = declarative
|
|
include(../../../common.pri)
|
|
|
|
QT += declarative
|
|
@@ -16,7 +18,6 @@ SOURCES += qdeclarativeservice.cpp \
|
|
CONFIG += mobility
|
|
MOBILITY += serviceframework
|
|
|
|
-DESTDIR = $$[QT_INSTALL_PREFIX]/imports/$$TARGETPATH
|
|
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
|
|
|
|
qmldir.files += $$PWD/qmldir
|
|
--
|
|
1.7.0.1
|
|
|