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

Cleanup leftover QWS

Browse Source 
QWS is replaced with QPA in Qt5

Change-Id: Iccec38e55ae23a27ebecd8010e1df7bba8aa5a33
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Tasuku Suzuki 2021-04-13 11:30:28 +09:00
parent 94e03e506a
commit 2df3d8ed41
9 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/common/qnx/qplatformdefs.h
View File

@ -99,6 +99,4 @@ inline int getpagesize()
#include <stdlib.h> #include <stdlib.h>
#define QT_QWS_TEMP_DIR QString::fromLatin1(qgetenv("TMP"))
#endif // Q_QNX_PLATFORMDEFS_H #endif // Q_QNX_PLATFORMDEFS_H

2
mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h
View File

@ -96,6 +96,4 @@ inline float strtof(const char *b, char **e)
return float(strtod(b, e)); return float(strtod(b, e));
} }
#define QT_QWS_TEMP_DIR QString::fromLatin1(qgetenv("TMP"))
#endif // QPLATFORMDEFS_H #endif // QPLATFORMDEFS_H

2
src/corelib/io/qfsfileengine_unix.cpp
View File

@ -56,7 +56,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <limits.h> #include <limits.h>
#include <errno.h> #include <errno.h>
#if !defined(QWS) && defined(Q_OS_MAC) #if defined(Q_OS_MACOS)
# include <private/qcore_mac_p.h> # include <private/qcore_mac_p.h>
#endif #endif

2
src/corelib/text/qlocale.cpp
View File

@ -40,7 +40,7 @@
#include "qglobal.h" #include "qglobal.h"
#if !defined(QWS) && defined(Q_OS_MAC) #if defined(Q_OS_MACOS)
# include "private/qcore_mac_p.h" # include "private/qcore_mac_p.h"
# include <CoreFoundation/CoreFoundation.h> # include <CoreFoundation/CoreFoundation.h>
#endif #endif

1
src/gui/image/qimage.h
View File

@ -320,7 +320,6 @@ protected:
QImage smoothScaled(int w, int h) const; QImage smoothScaled(int w, int h) const;
private: private:
friend class QWSOnScreenSurface;
QImageData *d; QImageData *d;
friend class QRasterPlatformPixmap; friend class QRasterPlatformPixmap;

6
src/widgets/kernel/qapplication.cpp
View File

@ -2266,12 +2266,6 @@ bool qt_try_modal(QWidget *widget, QEvent::Type type)
bool block_event = false; bool block_event = false;
switch (type) { switch (type) {
#if 0
case QEvent::Focus:
if (!static_cast<QWSFocusEvent*>(event)->simpleData.get_focus)
break;
// drop through
#endif
case QEvent::MouseButtonPress: // disallow mouse/key events case QEvent::MouseButtonPress: // disallow mouse/key events
case QEvent::MouseButtonRelease: case QEvent::MouseButtonRelease:
case QEvent::MouseMove: case QEvent::MouseMove:

1
src/widgets/kernel/qwidget.h
View File

@ -65,7 +65,6 @@ QT_BEGIN_NAMESPACE
class QLayout; class QLayout;
class QWSRegionManager;
class QStyle; class QStyle;
class QAction; class QAction;
class QVariant; class QVariant;

3
src/widgets/styles/qwindowsstyle.cpp
View File

@ -2320,12 +2320,11 @@ QSize QWindowsStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt,
int minwidth = int(QStyleHelper::dpiScaled(75, dpi)); int minwidth = int(QStyleHelper::dpiScaled(75, dpi));
int minheight = int(QStyleHelper::dpiScaled(23, dpi)); int minheight = int(QStyleHelper::dpiScaled(23, dpi));
#ifndef QT_QWS_SMALL_PUSHBUTTON
if (w < minwidth + defwidth && !btn->text.isEmpty()) if (w < minwidth + defwidth && !btn->text.isEmpty())
w = minwidth + defwidth; w = minwidth + defwidth;
if (h < minheight + defwidth) if (h < minheight + defwidth)
h = minheight + defwidth; h = minheight + defwidth;
#endif
sz = QSize(w, h); sz = QSize(w, h);
} }
break; break;

13
src/widgets/util/qcolormap.cpp
View File

@ -175,12 +175,6 @@ uint QColormap::pixel(const QColor &color) const
const int green_mask = 0x00ff00; const int green_mask = 0x00ff00;
const int blue_mask = 0x0000ff; const int blue_mask = 0x0000ff;
const int tg = g << green_shift; const int tg = g << green_shift;
#ifdef QT_QWS_DEPTH_32_BGR
if (qt_screen->pixelType() == QScreen::BGRPixel) {
const int tb = b << red_shift;
return 0xff000000 | (r & blue_mask) | (tg & green_mask) | (tb & red_mask);
}
#endif
const int tr = r << red_shift; const int tr = r << red_shift;
return 0xff000000 | (b & blue_mask) | (tg & green_mask) | (tr & red_mask); return 0xff000000 | (b & blue_mask) | (tg & green_mask) | (tr & red_mask);
} }
@ -202,13 +196,6 @@ const QColor QColormap::colorAt(uint pixel) const
const int red_mask = 0xff0000; const int red_mask = 0xff0000;
const int green_mask = 0x00ff00; const int green_mask = 0x00ff00;
const int blue_mask = 0x0000ff; const int blue_mask = 0x0000ff;
#ifdef QT_QWS_DEPTH_32_BGR
if (qt_screen->pixelType() == QScreen::BGRPixel) {
return QColor((pixel & blue_mask),
(pixel & green_mask) >> green_shift,
(pixel & red_mask) >> red_shift);
}
#endif
return QColor((pixel & red_mask) >> red_shift, return QColor((pixel & red_mask) >> red_shift,
(pixel & green_mask) >> green_shift, (pixel & green_mask) >> green_shift,
(pixel & blue_mask)); (pixel & blue_mask));