Merge branch 'more-qt-win-build-fixes' of https://github.com/catalinr/wxWidgets

Miscellaneous fixes for building wxQt under MSW. See https://github.com/wxWidgets/wxWidgets/pull/918
2018-09-17 23:26:27 +02:00
parent 795095a4ec 5349d48c38
commit 1f435261f6
20 changed files with 221 additions and 267 deletions
--- a/include/wx/qt/taskbar.h
+++ b/include/wx/qt/taskbar.h
@@ -10,7 +10,7 @@

 class QSystemTrayIcon;

-class WXDLLIMPEXP_CORE wxTaskBarIcon : public wxTaskBarIconBase
+class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase
 {
 public:
    wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE);