Dear Phil,
here is a patch, that fixes the Qt3 build fallout of 2.8.1.
Not sure, if they're correct, but at least, they have a chance to.. ;)
As usual, I tried to be as minimal invasive as possible.
Also, I noticed, that building designer-Qt4Qt5 needs something similar to:
pushd designer-Qt4Qt5
ln -s ../Qt4Qt5/Qsci
qmake designer.pro
make %{?_smp_mflags}
popd
to build properly. The symlink wasn't necessary before.
Yes, I know, I'm rather old-school as such..
Cheers,
Pete
Index: b/Qt3/qsciscintillabase.cpp
===================================================================
--- a/Qt3/qsciscintillabase.cpp
+++ b/Qt3/qsciscintillabase.cpp
@@ -421,9 +421,14 @@ void QsciScintillaBase::focusOutEvent(QF
// there are still problems because subsequent focus out events don't
// always seem to get generated (at least with Qt5).
+#if QT_VERSION >= 0x040000
if (e->reason() == Qt::ActiveWindowFocusReason)
{
QWidget *aw = QApplication::activeWindow();
+#else
+ {
+ QWidget *aw = qApp->activeWindow();
+#endif
if (!aw || aw->parent() != this || !aw->inherits("QsciSciListBox"))
sci->SetFocusState(false);
Index: b/Qt3/PlatQt.cpp
===================================================================
--- a/Qt3/PlatQt.cpp
+++ b/Qt3/PlatQt.cpp
@@ -40,6 +40,10 @@
#include <qpointarray.h>
+#if QT_VERSION < 0x040000
+#include <qpaintdevicemetrics.h>
+#endif
+
#include "SciNamespace.h"
#include "Platform.h"
@@ -180,7 +184,14 @@ public:
void Release();
bool Initialised() {return painter;}
void PenColour(ColourDesired fore);
+#if QT_VERSION >= 0x040000
int LogPixelsY() {return pd->logicalDpiY();}
+#else
+ int LogPixelsY() {
+ QPaintDeviceMetrics metrics(pd);
+ return metrics.logicalDpiY();
+ }
+#endif
int DeviceHeightFont(int points) {return points;}
void MoveTo(int x_,int y_);
void LineTo(int x_,int y_);
Index: b/Qt3/qscintilla.pro
===================================================================
--- a/Qt3/qscintilla.pro
+++ b/Qt3/qscintilla.pro
@@ -268,7 +268,7 @@ SOURCES = \
../lexers/LexInno.cpp \
../lexers/LexKix.cpp \
../lexers/LexKVIrc.cpp \
- ../lexers/LexLaTex.cpp \
+ ../lexers/LexLaTeX.cpp \
../lexers/LexLisp.cpp \
../lexers/LexLout.cpp \
../lexers/LexLua.cpp \
_______________________________________________
QScintilla mailing list
[email protected]
http://www.riverbankcomputing.com/mailman/listinfo/qscintilla
