From 8cf666e10cec48146632c93b55b3dc1e6313a410 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Wed, 22 Jan 2014 23:33:32 +0100 Subject: Build on Windows Embedded when -qtlibinfix is used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The resource file that needs to be included is hardcoded whereas qmake generates one that is based on the target name (which includes the libinfix). So to ensure the right one is available, a copy of the generated rc file is done to the name it expects. [ChangeLog][Platform Specific Changes][Windows Embedded] Fixed building issue when configuring Qt with -qtlibinfix Change-Id: I46ddbc5d22424bf63c54423618385e4268790eeb Reviewed-by: Björn Breitmeyer --- src/widgets/widgets/widgets.pri | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/widgets/widgets/widgets.pri') diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index 1bae87ebcc..a924ba9acc 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -160,4 +160,13 @@ wince*: { HEADERS += widgets/qmenu_wince_resource_p.h RC_FILE = widgets/qmenu_wince.rc !static: QMAKE_WRITE_DEFAULT_RC = 1 + !isEmpty(QT_LIBINFIX) { + ORIG_RCFILE = $${TARGET}_resource.rc + copyrcc.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + copyrcc.input = ORIG_RCFILE + CONFIG(debug, debug|release):copyrcc.output = $${ORIG_TARGET}d_resource.rc + else:copyrcc.output = $${ORIG_TARGET}_resource.rc + copyrcc.CONFIG = target_predeps no_link + QMAKE_EXTRA_COMPILERS += copyrcc + } } -- cgit v1.2.3