diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 09:01:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-18 09:01:51 +0100 |
| commit | c7934f2489e2eb9a539206bab35f335b1943c5bd (patch) | |
| tree | a27d0ed6c001fe9432e2a0f28fb935acf9e4c65f /qtbase.pro | |
| parent | f40593b11199fbef886bfcb6b210a214d8c3adf3 (diff) | |
| parent | 08f9a1bd6ab9b1777ee5ba163d75e5c848c39eb4 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess_unix.cpp
src/network/kernel/qnetworkinterface_winrt.cpp
tools/configure/configureapp.cpp
Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea
Diffstat (limited to 'qtbase.pro')
| -rw-r--r-- | qtbase.pro | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/qtbase.pro b/qtbase.pro index 5b709864c7..663ff8769d 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -42,6 +42,11 @@ licheck.path = $$[QT_HOST_BINS] licheck.files = $$PWD/bin/$$QT_LICHECK !isEmpty(QT_LICHECK): INSTALLS += licheck +#fixqt4headers.pl +fixqt4headers.path = $$[QT_HOST_BINS] +fixqt4headers.files = $$PWD/bin/fixqt4headers.pl +INSTALLS += fixqt4headers + #syncqt syncqt.path = $$[QT_HOST_BINS] syncqt.files = $$PWD/bin/syncqt.pl |