diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-22 06:50:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-22 06:50:42 +0200 |
| commit | 261a87f956f345d4064eb2eb64e0cf7c98ec7d92 (patch) | |
| tree | 53d10a28cdaf526418f4419c99cb26485c047a0d /src/plugins/platforms/cocoa/cocoa.pro | |
| parent | 0652bdcf5e60461cd9a513d64be00b8830826fad (diff) | |
| parent | 5f1cf8e0f5da36063202d46463c2d9e79d841a4d (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
qmake/generators/makefile.cpp
Change-Id: Ib3715e626f2fd32804c75c16ea9aa06a1216e76d
Diffstat (limited to 'src/plugins/platforms/cocoa/cocoa.pro')
| -rw-r--r-- | src/plugins/platforms/cocoa/cocoa.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index 083b7c1655..02e00039ae 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -6,6 +6,7 @@ SOURCES += main.mm \ qcocoatheme.mm \ qcocoabackingstore.mm \ qcocoawindow.mm \ + qcocoawindowmanager.mm \ qnsview.mm \ qnswindow.mm \ qnswindowdelegate.mm \ @@ -41,6 +42,7 @@ HEADERS += qcocoaintegration.h \ qcocoatheme.h \ qcocoabackingstore.h \ qcocoawindow.h \ + qcocoawindowmanager.h \ qnsview.h \ qnswindow.h \ qnswindowdelegate.h \ |