diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:56:18 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:56:18 +0100 |
| commit | 6b1f857db586586e56ce5829635b33e51be74e8e (patch) | |
| tree | e776581154f51e1ec9b0b21033d5fcabde1b17d5 /tools | |
| parent | fee3be1bdf6de5192a70400e6acf4c5b5e55680b (diff) | |
| parent | e0c119ccd4ca49b6fecb708133bb0d3008903560 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I312dcd7f8bbe6e15b157406e174c160e0eb7e225
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tools.pro | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/tools.pro b/tools/tools.pro index 3952ec4b01..f3988a909a 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -4,9 +4,6 @@ SUBDIRS += \ qmlmin \ qmlimportscanner -qmlmin.CONFIG = host_build -qmlimportscanner.CONFIG = host_build - !android|android_app { SUBDIRS += \ qml \ |