diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-28 09:51:04 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-28 09:53:31 +0100 |
| commit | e280d6794a2b9fc6b9280f2f91016e5f95570d9d (patch) | |
| tree | 11a7f0944721f84a5e72a9b48d4e8893091d72bd /src/process/process.pro | |
| parent | fd73b33893e0acb22c6082a1754b01bf9f5c436e (diff) | |
| parent | 09a341f4a62a0fe244dc188a75d77d0067ad1fe7 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/3rdparty
Change-Id: I49acdd9b5ca94f2807b0c13a97f508a67f1c5750
Diffstat (limited to 'src/process/process.pro')
| -rw-r--r-- | src/process/process.pro | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/process/process.pro b/src/process/process.pro index 7bf06a376..ee859a05c 100644 --- a/src/process/process.pro +++ b/src/process/process.pro @@ -24,6 +24,11 @@ INCLUDEPATH += ../core SOURCES = main.cpp +win32 { + SOURCES += \ + support_win.cpp +} + contains(QT_CONFIG, qt_framework) { target.path = $$[QT_INSTALL_LIBS]/QtWebEngineCore.framework/Versions/5/Helpers } else { |