diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2020-06-10 15:02:46 +0200 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2020-06-17 18:03:29 +0000 |
| commit | 9a5dde11b957112f1828ca572347e78873dce32c (patch) | |
| tree | b81b45b18528822b43fd59e45eaf9b3b4f47e726 | |
| parent | e93d8f4c2df8cb05bc4ca6edbd09b396c2cbb25b (diff) | |
Fix output of Qt tools generated outside project dir
Removed %(RelativeDir) from the default output path of Qt tools. This
will allow files outside of the project directory structure to be used
as sources to Qt tools. Previously, using external files with Qt tools
would generate the corresponding outputs also outside of the project
directory structure.
Also removed '\' after $(IntDir) as this property already contains a
trailing backslash.
Task-number: QTVSADDINBUG-783
Task-number: QTVSADDINBUG-756
Change-Id: I20ed6af33f5879fb6311d1f4efdd759aa47f3575
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | src/qtmsbuild/moc/qtmoc.props | 2 | ||||
| -rw-r--r-- | src/qtmsbuild/rcc/qtrcc.props | 2 | ||||
| -rw-r--r-- | src/qtmsbuild/uic/qtuic.props | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/qtmsbuild/moc/qtmoc.props b/src/qtmsbuild/moc/qtmoc.props index 9d1be76b..f46aad3f 100644 --- a/src/qtmsbuild/moc/qtmoc.props +++ b/src/qtmsbuild/moc/qtmoc.props @@ -60,7 +60,7 @@ >$(ProjectDir)GeneratedFiles\$(Configuration)\moc_%(Filename).cpp</OutputFile> <QtMocDir Condition="'$(QtVsProjectSettings)' == 'true'" - >$(IntDir)\moc\%(RelativeDir)</QtMocDir> + >$(IntDir)moc\</QtMocDir> <QtMocFileName Condition="'$(QtVsProjectSettings)' == 'true'" >moc_%(Filename).cpp</QtMocFileName> diff --git a/src/qtmsbuild/rcc/qtrcc.props b/src/qtmsbuild/rcc/qtrcc.props index ce660b00..22ca8e52 100644 --- a/src/qtmsbuild/rcc/qtrcc.props +++ b/src/qtmsbuild/rcc/qtrcc.props @@ -60,7 +60,7 @@ >$(ProjectDir)GeneratedFiles\$(Configuration)\qrc_%(Filename).cpp</OutputFile> <QtRccDir Condition="'$(QtVsProjectSettings)' == 'true'" - >$(IntDir)\rcc\%(RelativeDir)</QtRccDir> + >$(IntDir)rcc\</QtRccDir> <QtRccFileName Condition="'$(QtVsProjectSettings)' == 'true'" >qrc_%(Filename).cpp</QtRccFileName> diff --git a/src/qtmsbuild/uic/qtuic.props b/src/qtmsbuild/uic/qtuic.props index eb9ee63a..05419b63 100644 --- a/src/qtmsbuild/uic/qtuic.props +++ b/src/qtmsbuild/uic/qtuic.props @@ -61,7 +61,7 @@ >$(ProjectDir)GeneratedFiles\$(Configuration)\ui_%(Filename).h</OutputFile> <QtUicDir Condition="'$(QtVsProjectSettings)' == 'true'" - >$(IntDir)\uic\%(RelativeDir)</QtUicDir> + >$(IntDir)uic\</QtUicDir> <QtUicFileName Condition="'$(QtVsProjectSettings)' == 'true'" >ui_%(Filename).h</QtUicFileName> |