ezx
changeset 2:e80f9c95ff38 tip
[project @ 3]
Qt4 patch added
| author | Dmitry Nezhevenko <dion@inhex.net> |
|---|---|
| date | Fri, 10 Aug 2007 19:51:21 +0000 |
| parents | d428194b9844 |
| children | |
| files | ezxbridge/patches/qt4-ezx.diff |
| diffstat | 1 files changed, 134 insertions(+), 0 deletions(-) [+] |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/ezxbridge/patches/qt4-ezx.diff Fri Aug 10 19:51:21 2007 +0000 1.3 @@ -0,0 +1,139 @@ 1.4 +# Qt4 patch for motorola EZX (mostly E680/A780): 1.5 +# * Limit dialog size to 240x320 1.6 +# * Reduce window decoration height for Plastique 1.7 +# * qconfig for EZX 1.8 +# * s/Space/Enter for tetrix example 1.9 +--- ./src/gui/kernel/qwidget.cpp.orig 2007-02-21 12:20:54.000000000 +0200 1.10 ++++ ./src/gui/kernel/qwidget.cpp 2007-04-24 13:52:45.000000000 +0300 1.11 +@@ -5231,6 +5231,14 @@ void QWidget::setVisible(bool visible) 1.12 + setAttribute(Qt::WA_Resized, false); 1.13 + } 1.14 + 1.15 ++ // Maximize if widget is too big to fit 240x320 screen 1.16 ++ if (width()>320 || height()>240) 1.17 ++ { 1.18 ++ qDebug("Adjusting widget size\n"); 1.19 ++ setWindowState((windowState() & ~(Qt::WindowMinimized | Qt::WindowFullScreen)) 1.20 ++ | Qt::WindowMaximized); 1.21 ++ } 1.22 ++ 1.23 + setAttribute(Qt::WA_KeyboardFocusChange, false); 1.24 + 1.25 + if (isWindow() || parentWidget()->isVisible()) 1.26 +--- ./src/gui/styles/qplastiquestyle.cpp.orig 2007-04-24 13:56:11.000000000 +0300 1.27 ++++ ./src/gui/styles/qplastiquestyle.cpp 2007-04-24 13:59:10.000000000 +0300 1.28 +@@ -5269,7 +5269,7 @@ int QPlastiqueStyle::pixelMetric(PixelMe 1.29 + } else 1.30 + #endif 1.31 + ret = qMax(widget ? widget->fontMetrics().lineSpacing() : 1.32 +- (option ? option->fontMetrics.lineSpacing() : 0), 30); 1.33 ++ (option ? option->fontMetrics.lineSpacing() : 0), 15); 1.34 + break; 1.35 + case PM_MaximumDragDistance: 1.36 + return -1; 1.37 +--- ./src/corelib/global/qconfig-ezx.h.orig 2007-04-23 16:26:23.000000000 +0300 1.38 ++++ ./src/corelib/global/qconfig-ezx.h 2007-04-24 00:38:46.000000000 +0300 1.39 +@@ -0,0 +1,35 @@ 1.40 ++ 1.41 ++/* File I/O */ 1.42 ++#ifndef QT_NO_FILESYSTEMWATCHER 1.43 ++# define QT_NO_FILESYSTEMWATCHER 1.44 ++#endif 1.45 ++ 1.46 ++/* Internationalization */ 1.47 ++#ifndef QT_NO_BIG_CODECS 1.48 ++# define QT_NO_BIG_CODECS 1.49 ++#endif 1.50 ++ 1.51 ++/* Qtopia Core */ 1.52 ++#ifndef QT_NO_QWS_ALPHA_CURSOR 1.53 ++# define QT_NO_QWS_ALPHA_CURSOR 1.54 ++#endif 1.55 ++#ifndef QT_NO_QWS_CURSOR 1.56 ++# define QT_NO_QWS_CURSOR 1.57 ++#endif 1.58 ++#ifndef QT_NO_QWS_MOUSE_AUTO 1.59 ++# define QT_NO_QWS_MOUSE_AUTO 1.60 ++#endif 1.61 ++ 1.62 ++/* Styles */ 1.63 ++#ifndef QT_NO_STYLE_MOTIF 1.64 ++# define QT_NO_STYLE_MOTIF 1.65 ++#endif 1.66 ++#ifndef QT_NO_STYLE_CLEANLOOKS 1.67 ++# define QT_NO_STYLE_CLEANLOOKS 1.68 ++#endif 1.69 ++#ifndef QT_NO_STYLE_STYLESHEET 1.70 ++# define QT_NO_STYLE_STYLESHEET 1.71 ++#endif 1.72 ++#ifndef QT_NO_STYLE_WINDOWSXP 1.73 ++# define QT_NO_STYLE_WINDOWSXP 1.74 ++#endif 1.75 +--- ./mkspecs/qws/linux-ipaq-g++/qmake.conf.orig 2007-04-23 16:15:06.000000000 +0300 1.76 ++++ ./mkspecs/qws/linux-ipaq-g++/qmake.conf 2007-04-23 22:47:34.000000000 +0300 1.77 +@@ -1,5 +1,5 @@ 1.78 + # 1.79 +-# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler 1.80 ++# qmake configuration for linux-g++ using the arm-linux-gnu-g++ crosscompiler 1.81 + # 1.82 + 1.83 + MAKEFILE_GENERATOR = UNIX 1.84 +@@ -8,7 +8,7 @@ CONFIG += qt warn_on release link_prl 1.85 + QT += core gui network 1.86 + QMAKE_INCREMENTAL_STYLE = sublib 1.87 + 1.88 +-QMAKE_CC = arm-linux-gcc 1.89 ++QMAKE_CC = arm-linux-gnu-gcc 1.90 + QMAKE_LEX = flex 1.91 + QMAKE_LEXFLAGS = 1.92 + QMAKE_YACC = yacc 1.93 +@@ -23,7 +23,7 @@ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-par 1.94 + QMAKE_CFLAGS_THREAD = -D_REENTRANT 1.95 + QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden 1.96 + 1.97 +-QMAKE_CXX = arm-linux-g++ -DQT_QWS_IPAQ 1.98 ++QMAKE_CXX = arm-linux-gnu-g++ -DQT_QWS_IPAQ 1.99 + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS 1.100 + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON 1.101 + QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF 1.102 +@@ -34,8 +34,8 @@ QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YAC 1.103 + QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD 1.104 + QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden 1.105 + 1.106 +-QMAKE_INCDIR = 1.107 +-QMAKE_LIBDIR = 1.108 ++QMAKE_INCDIR = $(HOME)/Documents/src/mkezx/ezxlocal/mmc/include 1.109 ++QMAKE_LIBDIR = $(HOME)/Documents/src/mkezx/ezxlocal/mmc/lib 1.110 + QMAKE_INCDIR_X11 = 1.111 + QMAKE_LIBDIR_X11 = 1.112 + QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] 1.113 +@@ -45,8 +45,8 @@ QMAKE_LIBDIR_OPENGL = 1.114 + QMAKE_INCDIR_QTOPIA = $(QPEDIR)/include 1.115 + QMAKE_LIBDIR_QTOPIA = $(QPEDIR)/lib 1.116 + 1.117 +-QMAKE_LINK = arm-linux-g++ 1.118 +-QMAKE_LINK_SHLIB = arm-linux-g++ 1.119 ++QMAKE_LINK = arm-linux-gnu-g++ 1.120 ++QMAKE_LINK_SHLIB = arm-linux-gnu-g++ 1.121 + QMAKE_LFLAGS = 1.122 + QMAKE_LFLAGS_RELEASE = 1.123 + QMAKE_LFLAGS_DEBUG = 1.124 +@@ -79,7 +79,7 @@ QMAKE_COPY = cp -f 1.125 + QMAKE_MOVE = mv -f 1.126 + QMAKE_DEL_FILE = rm -f 1.127 + QMAKE_DEL_DIR = rmdir 1.128 +-QMAKE_STRIP = arm-linux-strip 1.129 ++QMAKE_STRIP = arm-linux-gnu-strip 1.130 + QMAKE_CHK_DIR_EXISTS = test -d 1.131 + QMAKE_MKDIR = mkdir -p 1.132 + load(qt_config) 1.133 +--- ./examples/widgets/tetrix/tetrixboard.cpp.orig 2007-02-21 12:21:05.000000000 +0200 1.134 ++++ ./examples/widgets/tetrix/tetrixboard.cpp 2007-04-24 14:03:58.000000000 +0300 1.135 +@@ -143,6 +143,7 @@ void TetrixBoard::keyPressEvent(QKeyEven 1.136 + case Qt::Key_Up: 1.137 + tryMove(curPiece.rotatedLeft(), curX, curY); 1.138 + break; 1.139 ++ case Qt::Key_Enter: 1.140 + case Qt::Key_Space: 1.141 + dropDown(); 1.142 + break;