From 36514a92209652d0f1e39a7b0897107345eedd78 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 2 Nov 2012 01:36:31 +0100 Subject: specify MODULE to avoid module .pri filename clash Since 733ac1f6e6b3155a594376ef99288c6117124000 the default MODULE is the base of the .pro file for the plugin (i.e., "windows"). Since MODULE becomes the base of the module .pri, the names of the module .pri files can clash. Now we explicitly specify MODULE for printersupport plugins to avoid overwriting the module .pri files of the platform plugins whose .pro files have the same names. Follow-up to 81f8f0db5cb75e29b041a011ca4e7dbbf2d903c5 which renamed the TARGET. Change-Id: Ie83892dc419257e1df3b81bcf6ecec751ae345b0 Reviewed-by: Oswald Buddenhagen --- src/plugins/printsupport/cocoa/cocoa.pro | 2 +- src/plugins/printsupport/cups/cups.pro | 2 +- src/plugins/printsupport/windows/windows.pro | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/printsupport/cocoa/cocoa.pro b/src/plugins/printsupport/cocoa/cocoa.pro index 4e99b4a8f5..c0206fd2bc 100644 --- a/src/plugins/printsupport/cocoa/cocoa.pro +++ b/src/plugins/printsupport/cocoa/cocoa.pro @@ -1,5 +1,5 @@ TARGET = cocoaprintersupport - +MODULE = cocoaprintersupport PLUGIN_TYPE = printsupport load(qt_plugin) diff --git a/src/plugins/printsupport/cups/cups.pro b/src/plugins/printsupport/cups/cups.pro index bd0b6af114..0ea5058c00 100644 --- a/src/plugins/printsupport/cups/cups.pro +++ b/src/plugins/printsupport/cups/cups.pro @@ -1,5 +1,5 @@ TARGET = cupsprintersupport - +MODULE = cupsprintersupport PLUGIN_TYPE = printsupport load(qt_plugin) diff --git a/src/plugins/printsupport/windows/windows.pro b/src/plugins/printsupport/windows/windows.pro index 5e8738554c..5b5dd86beb 100644 --- a/src/plugins/printsupport/windows/windows.pro +++ b/src/plugins/printsupport/windows/windows.pro @@ -1,5 +1,5 @@ TARGET = windowsprintersupport - +MODULE = windowsprintersupport PLUGIN_TYPE = printsupport load(qt_plugin) -- cgit v1.2.3