summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qcoreapplication_win.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2016-06-30 21:47:14 +0200
committerLars Knoll <lars.knoll@qt.io>2016-07-14 13:46:03 +0000
commit64507c7165e42c2a5029353d8f97a0d841fa6b01 (patch)
tree12842e3bdda199bb6ee3cb9f29b443fe4618d1e6 /src/corelib/kernel/qcoreapplication_win.cpp
parent994d04883cf278e0258ed66de75c8c8b0bfb9339 (diff)
Clean up qwindowdefs_win.h
The file lives in Qt Gui, but declares a few methods from Qt Core and Widgets. All of those methods are actually mostly unused, not documented and pretty trivial. This patch removes the last few places the methods got used and removes the declarations. The implementations should get removed in a future release. Change-Id: I2b609c29f403d2ed4824ff4346008be08b3fd067 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication_win.cpp')
-rw-r--r--src/corelib/kernel/qcoreapplication_win.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp
index 67261645ac..67e509eeef 100644
--- a/src/corelib/kernel/qcoreapplication_win.cpp
+++ b/src/corelib/kernel/qcoreapplication_win.cpp
@@ -122,6 +122,7 @@ QString QCoreApplicationPrivate::appName() const
#ifndef Q_OS_WINRT
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Q_CORE_EXPORT HINSTANCE qWinAppInst() // get Windows app handle
{
return GetModuleHandle(0);
@@ -145,6 +146,7 @@ Q_CORE_EXPORT int qWinAppCmdShow() // get main window sho
: SW_SHOWDEFAULT;
#endif
}
+#endif
/*****************************************************************************
qWinMain() - Initializes Windows. Called from WinMain() in qtmain_win.cpp