diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:28:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:28:21 +0100 |
| commit | 50630d6545bf70d62e08abf9ae83e7f34898471c (patch) | |
| tree | cde74734dab8ec611303dd26b5e1a4029f89a907 /src/qtattributionsscanner | |
| parent | 32b39d66546ecba49acb6eef75a0d45df70da20f (diff) | |
| parent | 672379e8a1930e6637f8bd75dd8a3660d7a05315 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: Ide38734b7f27b855ed8fecb810e5cdc7d518110e
Diffstat (limited to 'src/qtattributionsscanner')
| -rw-r--r-- | src/qtattributionsscanner/qtattributionsscanner.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qtattributionsscanner/qtattributionsscanner.pro b/src/qtattributionsscanner/qtattributionsscanner.pro index 6bc20e419..827e5f5cf 100644 --- a/src/qtattributionsscanner/qtattributionsscanner.pro +++ b/src/qtattributionsscanner/qtattributionsscanner.pro @@ -1,3 +1,4 @@ +option(host_build) CONFIG += console SOURCES += \ @@ -17,5 +18,4 @@ HEADERS += \ DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII -option(host_build) load(qt_tool) |