diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2014-01-22 23:33:32 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-31 09:02:30 +0100 |
| commit | 8cf666e10cec48146632c93b55b3dc1e6313a410 (patch) | |
| tree | 578990cfd47d28a245c1f5216c60b18b4bc99699 | |
| parent | fed63d43943d8324a6f7faa6cab006ee8545e116 (diff) | |
Build on Windows Embedded when -qtlibinfix is used
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 <bjoern.breitmeyer@kdab.com>
| -rw-r--r-- | src/widgets/widgets.pro | 1 | ||||
| -rw-r--r-- | src/widgets/widgets/widgets.pri | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index e3222b49e8..0b289c75ae 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -1,4 +1,5 @@ TARGET = QtWidgets +wince*:ORIG_TARGET = $$TARGET QT = core-private gui-private MODULE_CONFIG = uic 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 + } } |