From 6e524bb082d8098ba6be5e47aaf9c9df8b575359 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 25 Oct 2012 17:34:15 +0200 Subject: adjust to qt_plugin.prf changes DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. TEMPLATE, some CONFIG flags and TARGET munging are unnecessary, too. this contains a nasty hack for examples, as we don't want users to use the internal prf files. Change-Id: I9af75f3040fd45d87ec9daea27e00588796ebe81 Reviewed-by: Joerg Bornemann --- .../taskmenuextension/taskmenuextension.pro | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'examples/designer/taskmenuextension/taskmenuextension.pro') diff --git a/examples/designer/taskmenuextension/taskmenuextension.pro b/examples/designer/taskmenuextension/taskmenuextension.pro index b66318eed..900a05cf0 100644 --- a/examples/designer/taskmenuextension/taskmenuextension.pro +++ b/examples/designer/taskmenuextension/taskmenuextension.pro @@ -1,12 +1,25 @@ #! [0] -TEMPLATE = lib +QT += widgets designer #! [0] -TARGET = $$qtLibraryTarget($$TARGET) + +QTDIR_build { +# This is only for the Qt build. Do not use externally. We mean it. +PLUGIN_TYPE = designer +load(qt_plugin) +} else { +# Public example: + #! [1] +TEMPLATE = lib CONFIG += plugin -QT += widgets designer #! [1] -DESTDIR = $$QT.designer.plugins/designer + +TARGET = $$qtLibraryTarget($$TARGET) + +target.path = $$[QT_INSTALL_PLUGINS]/designer +INSTALLS += target + +} #! [2] HEADERS += tictactoe.h \ @@ -21,7 +34,6 @@ OTHER_FILES += tictactoe.json #! [2] # install -target.path = $$[QT_INSTALL_PLUGINS]/designer sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/taskmenuextension -INSTALLS += target sources +INSTALLS += sources -- cgit v1.2.3