diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-10-24 15:36:50 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-02 20:24:00 +0100 |
| commit | 1ecda02d0b90d0a338b661aaae609052aa6b0319 (patch) | |
| tree | d0ace6ee356fbe8d2faa5ba264918a4c26a76bdb /tools | |
| parent | dd288947f065a13ac86b0673dc449fb063c67bc8 (diff) | |
adjust to qt_plugin.prf changes
DESTDIR and INSTALLS+=target are set up automatically now, but
PLUGIN_TYPE needs to be defined.
some other setup can be skipped as well.
Change-Id: If6e77a42a571e1977875b13bc8519a2cd43df16a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/designer/src/plugins/plugins.pri | 11 | ||||
| -rw-r--r-- | tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro | 7 |
2 files changed, 4 insertions, 14 deletions
diff --git a/tools/designer/src/plugins/plugins.pri b/tools/designer/src/plugins/plugins.pri index f3575bcb..330a2e7f 100644 --- a/tools/designer/src/plugins/plugins.pri +++ b/tools/designer/src/plugins/plugins.pri @@ -1,8 +1,5 @@ -CONFIG += designer -win32|mac: CONFIG+= debug_and_release -DESTDIR = $$QT.designer.plugins -contains(TEMPLATE, ".*lib"):TARGET = $$qtLibraryTarget($$TARGET) +QT += designer declarative -# install -target.path = $$[QT_INSTALL_PLUGINS]/designer -INSTALLS += target +PLUGIN_TYPE = designer +CONFIG += tool_plugin +load(qt_plugin) diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro index b8abe874..b08a568c 100644 --- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro +++ b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro @@ -1,13 +1,6 @@ -TEMPLATE = lib TARGET = qdeclarativeview -CONFIG += qt warn_on plugin designer -QT += declarative include(../plugins.pri) -build_all:!build_pass { - CONFIG -= build_all - CONFIG += release -} SOURCES += qdeclarativeview_plugin.cpp HEADERS += qdeclarativeview_plugin.h |