From 10089bb0bede5090f277a4f071804f67661ccf2c Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 3 Nov 2012 09:49:56 +0100 Subject: Adjust to qt_plugin.prf changes DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. Change-Id: Id652b3067aac4a47ccb64332c03ba2ba1b815c17 Reviewed-by: Oswald Buddenhagen Reviewed-by: Joerg Bornemann --- src/plugins/styles/cleanlooks/cleanlooks.pro | 5 +---- src/plugins/styles/motif/motif.pro | 5 +---- src/plugins/styles/plastique/plastique.pro | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/plugins/styles/cleanlooks/cleanlooks.pro b/src/plugins/styles/cleanlooks/cleanlooks.pro index 91ccdfb..08a385d 100644 --- a/src/plugins/styles/cleanlooks/cleanlooks.pro +++ b/src/plugins/styles/cleanlooks/cleanlooks.pro @@ -1,4 +1,5 @@ TARGET = qcleanlooksstyle +PLUGIN_TYPE = styles load(qt_plugin) QT = core gui widgets @@ -10,7 +11,3 @@ SOURCES += plugin.cpp include(../shared/shared.pri) OTHER_FILES += cleanlooks.json - -DESTDIR = $$QT.gui.plugins/styles -target.path += $$[QT_INSTALL_PLUGINS]/styles -INSTALLS += target diff --git a/src/plugins/styles/motif/motif.pro b/src/plugins/styles/motif/motif.pro index 01242ae..1607424 100644 --- a/src/plugins/styles/motif/motif.pro +++ b/src/plugins/styles/motif/motif.pro @@ -1,4 +1,5 @@ TARGET = qmotifstyle +PLUGIN_TYPE = styles load(qt_plugin) QT = core gui widgets @@ -10,7 +11,3 @@ SOURCES += qmotifstyle.cpp SOURCES += plugin.cpp OTHER_FILES += motif.json - -DESTDIR = $$QT.gui.plugins/styles -target.path += $$[QT_INSTALL_PLUGINS]/styles -INSTALLS += target diff --git a/src/plugins/styles/plastique/plastique.pro b/src/plugins/styles/plastique/plastique.pro index ccdf8f5..dee3bb6 100644 --- a/src/plugins/styles/plastique/plastique.pro +++ b/src/plugins/styles/plastique/plastique.pro @@ -1,4 +1,5 @@ TARGET = qplastiquestyle +PLUGIN_TYPE = styles load(qt_plugin) QT = core core-private gui gui-private widgets @@ -10,7 +11,3 @@ SOURCES += plugin.cpp include(../shared/shared.pri) OTHER_FILES += plastique.json - -DESTDIR = $$QT.gui.plugins/styles -target.path += $$[QT_INSTALL_PLUGINS]/styles -INSTALLS += target -- cgit v1.2.3