diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-20 14:09:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-21 08:39:41 +0200 |
| commit | ea438b2508f329698e11c6dae6994d441c6e67df (patch) | |
| tree | 7a6052b98ba1ff6e0258c52cfc2726e197f53dd2 /src/src.pro | |
| parent | a2f319e9fb2f7595fc16d0d79e26438463051a53 (diff) | |
| parent | 5f0ec7305e4310123ddeb98d3523087e3c560d9c (diff) | |
| download | qtbase-ea438b2508f329698e11c6dae6994d441c6e67df.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/corelib/global/qglobal.cpp
src/corelib/global/qsysinfo.h
src/corelib/kernel/qcoreapplication_win.cpp
src/gui/text/qdistancefield.cpp
src/gui/text/qdistancefield_p.h
src/plugins/platforms/windows/qwindowsglcontext.cpp
src/plugins/platforms/windows/qwindowsglcontext.h
Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 4ca1347f2b..ac336f316d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -170,7 +170,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent contains(QT_CONFIG, png) { SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng - src_plugins.depends += src_3rdparty_libpng + src_gui.depends += src_3rdparty_libpng } contains(QT_CONFIG, freetype):!contains(QT_CONFIG, system-freetype) { SUBDIRS += src_3rdparty_freetype |