AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows: Remove rarely used integration/theming logging categories.

Browse Source 
Preparing the introduction of the categorized logging system for the
plugin.

Change-Id: I2b180d88cf508559f495d39d4e1d36b8f3da7051
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
This commit is contained in:
Friedemann Kleint 2014-01-10 17:02:49 +01:00 committed by The Qt Project
parent d47f83cab0
commit 7622049a71
7 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/platforms/windows/qwindowscontext.cpp
View File

@ -80,7 +80,6 @@
QT_BEGIN_NAMESPACE
// Verbosity of components
int QWindowsContext::verboseIntegration = 0;
int QWindowsContext::verboseWindows = 0;
int QWindowsContext::verboseEvents = 0;
int QWindowsContext::verboseBackingStore = 0;
@ -89,7 +88,6 @@ int QWindowsContext::verboseGL = 0;
int QWindowsContext::verboseOLE = 0;
int QWindowsContext::verboseInputMethods = 0;
int QWindowsContext::verboseDialogs = 0;
int QWindowsContext::verboseTheming = 0;
int QWindowsContext::verboseTablet = 0;
// Get verbosity of components from "foo:2,bar:3"
@ -321,7 +319,6 @@ QWindowsContext::QWindowsContext() :
const QByteArray bv = qgetenv("QT_QPA_VERBOSE");
if (!bv.isEmpty()) {
const char *v = bv.data();
QWindowsContext::verboseIntegration = componentVerbose(v, "integration");
QWindowsContext::verboseWindows = componentVerbose(v, "windows");
QWindowsContext::verboseEvents = componentVerbose(v, "events");
QWindowsContext::verboseBackingStore = componentVerbose(v, "backingstore");
@ -330,7 +327,6 @@ QWindowsContext::QWindowsContext() :
QWindowsContext::verboseOLE = componentVerbose(v, "ole");
QWindowsContext::verboseInputMethods = componentVerbose(v, "im");
QWindowsContext::verboseDialogs = componentVerbose(v, "dialogs");
QWindowsContext::verboseTheming = componentVerbose(v, "theming");
QWindowsContext::verboseTablet = componentVerbose(v, "tablet");
}
#if !defined(QT_NO_TABLETEVENT) && !defined(Q_OS_WINCE)
@ -519,7 +515,7 @@ QString QWindowsContext::registerWindowClass(QString cname,
qPrintable(cname));
d->m_registeredWindowClassNames.insert(cname);
if (QWindowsContext::verboseIntegration || QWindowsContext::verboseWindows)
if (QWindowsContext::verboseWindows)
qDebug().nospace() << __FUNCTION__ << ' ' << cname
<< " style=0x" << QString::number(style, 16)
<< " brush=" << brush << " icon=" << icon << " atom=" << atom;
@ -530,11 +526,8 @@ void QWindowsContext::unregisterWindowClasses()
{
const HINSTANCE appInstance = (HINSTANCE)GetModuleHandle(0);
foreach (const QString &name, d->m_registeredWindowClassNames) {
if (QWindowsContext::verboseIntegration)
qDebug() << __FUNCTION__ << name;
foreach (const QString &name, d->m_registeredWindowClassNames)
UnregisterClass((wchar_t*)name.utf16(), appInstance);
}
d->m_registeredWindowClassNames.clear();
}

2
src/plugins/platforms/windows/qwindowscontext.h
View File

@ -128,7 +128,6 @@ public:
};
// Verbose flag set by environment variable QT_QPA_VERBOSE
static int verboseIntegration;
static int verboseWindows;
static int verboseBackingStore;
static int verboseEvents;
@ -137,7 +136,6 @@ public:
static int verboseOLE;
static int verboseInputMethods;
static int verboseDialogs;
static int verboseTheming;
static int verboseTablet;
explicit QWindowsContext();

2
src/plugins/platforms/windows/qwindowsgdiintegration.cpp
View File

@ -75,8 +75,6 @@ QPlatformPixmap *QWindowsGdiIntegration::createPlatformPixmap(QPlatformPixmap::P
QPlatformBackingStore *QWindowsGdiIntegration::createPlatformBackingStore(QWindow *window) const
{
if (QWindowsContext::verboseIntegration)
qDebug() << __FUNCTION__ << window;
return new QWindowsBackingStore(window);
}

8
src/plugins/platforms/windows/qwindowsintegration.cpp
View File

@ -203,8 +203,6 @@ QWindowsIntegration::QWindowsIntegration(const QStringList &paramList) :
QWindowsIntegration::~QWindowsIntegration()
{
if (QWindowsContext::verboseIntegration)
qDebug("%s", __FUNCTION__);
}
bool QWindowsIntegration::hasCapability(QPlatformIntegration::Capability cap) const
@ -246,7 +244,7 @@ QPlatformWindow *QWindowsIntegration::createPlatformWindow(QWindow *window) cons
const QWindowsWindow::WindowData obtained
= QWindowsWindow::WindowData::create(window, requested, window->title());
if (QWindowsContext::verboseIntegration || QWindowsContext::verboseWindows)
if (QWindowsContext::verboseWindows)
qDebug().nospace()
<< __FUNCTION__ << '<' << window << '\n'
<< " Requested: " << requested.geometry << "frame incl.: "
@ -271,7 +269,7 @@ QPlatformWindow *QWindowsIntegration::createPlatformWindow(QWindow *window) cons
QPlatformOpenGLContext
*QWindowsIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const
{
if (QWindowsContext::verboseIntegration)
if (QWindowsContext::verboseGL)
qDebug() << __FUNCTION__ << context->format();
#ifdef QT_OPENGL_ES_2
if (d->m_staticEGLContext.isNull()) {
@ -326,7 +324,7 @@ QPlatformFontDatabase *QWindowsIntegration::fontDatabase() const
d->m_fontDatabase = new QWindowsFontDatabase;
#else
if (isQMLApplication()) {
if (QWindowsContext::verboseIntegration) {
if (QWindowsContext::verboseFonts) {
qDebug() << "QML application detected, using FreeType rendering";
}
d->m_fontDatabase = new QWindowsFontDatabaseFT;

2
src/plugins/platforms/windows/qwindowsscreen.cpp
View File

@ -201,8 +201,6 @@ Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat =
QPixmap QWindowsScreen::grabWindow(WId window, int x, int y, int width, int height) const
{
if (QWindowsContext::verboseIntegration)
qDebug() << __FUNCTION__ << window << x << y << width << height;
RECT r;
HWND hwnd = window ? (HWND)window : GetDesktopWindow();
GetClientRect(hwnd, &r);

9
src/plugins/platforms/windows/qwindowstheme.cpp
View File

@ -406,10 +406,6 @@ void QWindowsTheme::refreshPalettes()
m_palettes[ToolTipPalette] = new QPalette(toolTipPalette(*m_palettes[SystemPalette]));
m_palettes[MenuPalette] = new QPalette(menuPalette(*m_palettes[SystemPalette]));
m_palettes[MenuBarPalette] = menuBarPalette(*m_palettes[MenuPalette]);
if (QWindowsContext::verboseTheming)
qDebug() << __FUNCTION__ << '\n'
<< " system=" << paletteToString(*m_palettes[SystemPalette])
<< " tooltip=" << paletteToString(*m_palettes[ToolTipPalette]);
}
void QWindowsTheme::clearFonts()
@ -449,11 +445,6 @@ void QWindowsTheme::refreshFonts()
m_fonts[DockWidgetTitleFont] = new QFont(titleFont);
m_fonts[ItemViewFont] = new QFont(iconTitleFont);
m_fonts[FixedFont] = new QFont(fixedFont);
if (QWindowsContext::verboseTheming)
qDebug() << __FUNCTION__ << '\n'
<< " menuFont=" << menuFont
<< " messageBox=" << MessageBoxFont;
#endif // !Q_OS_WINCE
}

2
src/plugins/platforms/windows/qwindowswindow.cpp
View File

@ -949,7 +949,7 @@ void QWindowsWindow::fireExpose(const QRegion &region, bool force)
void QWindowsWindow::destroyWindow()
{
if (QWindowsContext::verboseIntegration || QWindowsContext::verboseWindows)
if (QWindowsContext::verboseWindows)
qDebug() << __FUNCTION__ << this << window() << m_data.hwnd;
if (m_data.hwnd) { // Stop event dispatching before Window is destroyed.
setFlag(WithinDestroy);