[patch] Re: trunk doesn't compile, GuiPrefs, Qt 4.2.1

[Dov Feldstern]

The attached seems to fix it, it would be good if somebody who actually 
knows Qt could confirm...

Dov Feldstern wrote:
make[6]: Entering directory `/home/dovf/lyx-trunk/src/frontends/qt4'
if /bin/sh ../../../libtool --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H 
-I. -I.
 -I../../../src  -DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL 
-DQT_NO_KEYWO
RDS -I../../../src -I../../../src/frontends -I../../../images 
-DQT_SHARED -I/usr
/include/qt4 -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui 
-I../../../boo
st -I../../../src/frontends/controllers  -Wextra -Wall     -g -O -MT 
GuiPrefs.lo
 -MD -MP -MF ".deps/GuiPrefs.Tpo" -c -o GuiPrefs.lo GuiPrefs.cpp; \
        then mv -f ".deps/GuiPrefs.Tpo" ".deps/GuiPrefs.Plo"; else rm -f 
".deps/
GuiPrefs.Tpo"; exit 1; fi
 g++ -DHAVE_CONFIG_H -I. -I. -I../../../src -DQT_CLEAN_NAMESPACE 
-DQT_GENUINE_ST
R -DQT_NO_STL -DQT_NO_KEYWORDS -I../../../src -I../../../src/frontends 
-I../../.
./images -DQT_SHARED -I/usr/include/qt4 -I/usr/include/qt4/QtCore 
-I/usr/include
/qt4/QtGui -I../../../boost -I../../../src/frontends/controllers -Wextra 
-Wall -
g -O -MT GuiPrefs.lo -MD -MP -MF .deps/GuiPrefs.Tpo -c GuiPrefs.cpp -o 
GuiPrefs.
o
GuiPrefs.cpp: In member function 'void 
lyx::frontend::PrefShortcuts::setItemType
(QTreeWidgetItem*, lyx::frontend::PrefShortcuts::item_type)':
GuiPrefs.cpp:1842: error: call of overloaded 'QBrush(QString&)' is 
ambiguous
/usr/include/qt4/QtGui/qbrush.h:54: note: candidates are: 
QBrush::QBrush(const Q
Pixmap&)
/usr/include/qt4/QtGui/qbrush.h:49: note: QBrush::QBrush(const Q
Color&, Qt::BrushStyle)
GuiPrefs.cpp:1843: error: call of overloaded 'QBrush(QString&)' is 
ambiguous
/usr/include/qt4/QtGui/qbrush.h:54: note: candidates are: 
QBrush::QBrush(const Q
Pixmap&)
/usr/include/qt4/QtGui/qbrush.h:49: note: QBrush::QBrush(const Q
Color&, Qt::BrushStyle)
make[6]: *** [GuiPrefs.lo] Error 1

diff -r e7ab9b7a3e9e src/frontends/qt4/GuiPrefs.cpp
--- a/src/frontends/qt4/GuiPrefs.cpp    Mon Oct 22 20:04:55 2007 +0200
+++ b/src/frontends/qt4/GuiPrefs.cpp    Mon Oct 22 20:21:44 2007 +0200
@@ -1839,8 +1839,8 @@ void PrefShortcuts::setItemType(QTreeWid
        }
 
 #if QT_VERSION >= 0x040200
-       item->setForeground(0, QBrush(color));
-       item->setForeground(1, QBrush(color));
+       item->setForeground(0, QBrush(QColor(color)));
+       item->setForeground(1, QBrush(QColor(color)));
 #else
        item->setTextColor(0, QColor(color));
        item->setTextColor(1, QColor(color));