diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-06 13:04:47 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-06 20:12:27 +0200 |
| commit | ef25620ac1acbe7a723b6b213d7d50468a748119 (patch) | |
| tree | abdff2aed36655dfb0305d232b0ac48f8ad67391 /qtbase.pro | |
| parent | 669add92d9adc15ecfa0b2d62dd90ea9066d401e (diff) | |
| parent | 6feec9da93032d11a768802ac2187d9d4153b1ec (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
mkspecs/features/mac/default_pre.prf
mkspecs/features/qpa/genericunixfontdatabase.prf
mkspecs/features/uikit/default_post.prf
mkspecs/features/uikit/resolve_config.prf
mkspecs/macx-ios-clang/features/default_post.prf
mkspecs/macx-ios-clang/features/resolve_config.prf
src/corelib/io/qiodevice.cpp
Change-Id: I6f210f71f177a3c3278a4f380542195e14e4b491
Diffstat (limited to 'qtbase.pro')
| -rw-r--r-- | qtbase.pro | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/qtbase.pro b/qtbase.pro index d2d308870d..4aa4d6f600 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -4,7 +4,7 @@ load(qt_parts) -SUBDIRS += qmake/qmake-aux.pro +SUBDIRS += qmake/qmake-aux.pro doc cross_compile: CONFIG += nostrip @@ -84,10 +84,6 @@ mkspecs.files = \ mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -global_docs.files = $$PWD/doc/global -global_docs.path = $$[QT_INSTALL_DOCS] -INSTALLS += global_docs - OTHER_FILES += \ configure \ header.BSD \ |