qtconfig doesn't build if qt3 support is disabled

--- qt-x11-opensource-src-4.5.0/tools/qtconfig/mainwindowbase.cpp.ark 2009-03-12 13:34:24.301753791 +0100
+++ qt-x11-opensource-src-4.5.0/tools/qtconfig/mainwindowbase.cpp 2009-03-12 15:12:17.926917466 +0100
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
  *
  */
 MainWindowBase::MainWindowBase(QWidget* parent, const char* name, Qt::WindowFlags fl)
-    : Q3MainWindow(parent, name, fl)
+    : QMainWindow(parent, fl)
 {
     setupUi(this);
 
--- qt-x11-opensource-src-4.5.0/tools/qtconfig/mainwindowbase.h.ark 2009-03-12 13:34:34.660868052 +0100
+++ qt-x11-opensource-src-4.5.0/tools/qtconfig/mainwindowbase.h 2009-03-12 13:34:42.816873424 +0100
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 class ColorButton;
 class PreviewFrame;
 
-class MainWindowBase : public Q3MainWindow, public Ui::MainWindowBase
+class MainWindowBase : public QMainWindow, public Ui::MainWindowBase
 {
     Q_OBJECT
 
--- qt-x11-opensource-src-4.5.0/tools/qtconfig/mainwindowbase.ui.ark 2009-03-12 13:34:49.213003602 +0100
+++ qt-x11-opensource-src-4.5.0/tools/qtconfig/mainwindowbase.ui 2009-03-12 13:35:44.174892046 +0100
@@ -41,7 +41,7 @@
 **
 *********************************************************************</comment>
  <class&gt;MainWindowBase</class&gt;
- <widget class="Q3MainWindow" name="MainWindowBase">
+ <widget class="QMainWindow" name="MainWindowBase">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -466,7 +466,7 @@
             </widget>
            </item>
            <item>
-            <widget class="Q3ListBox" name="sublistbox"/>
+            <widget class="QListWidget" name="sublistbox"/>
            </item>
            <item>
             <layout class="QHBoxLayout">
@@ -676,7 +676,7 @@
             </widget>
            </item>
            <item>
-            <widget class="Q3Frame" name="effectbase">
+            <widget class="QFrame" name="effectbase">
              <property name="frameShape">
               <enum>QFrame::NoFrame</enum>
              </property>
@@ -999,7 +999,7 @@
               </widget>
              </item>
              <item row="0" column="0" colspan="3">
-              <widget class="Q3ListBox" name="fontpathlistbox"/>
+              <widget class="QListWidget" name="fontpathlistbox"/>
              </item>
             </layout>
            </item>
@@ -1329,23 +1329,6 @@ p, li { white-space: pre-wrap; }
  </widget>
  <customwidgets>
   <customwidget>
-   <class&gt;Q3Frame</class&gt;
-   <extends>QFrame</extends>
-   <header>Qt3Support/Q3Frame</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class&gt;Q3MainWindow</class&gt;
-   <extends>QWidget</extends>
-   <header>q3mainwindow.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class&gt;Q3ListBox</class&gt;
-   <extends>Q3Frame</extends>
-   <header>q3listbox.h</header>
-  </customwidget>
-  <customwidget>
    <class&gt;ColorButton</class&gt;
    <extends></extends>
    <header>colorbutton.h</header>
--- qt-x11-opensource-src-4.5.0/tools/qtconfig/mainwindow.cpp.ark 2009-03-12 13:36:29.643134307 +0100
+++ qt-x11-opensource-src-4.5.0/tools/qtconfig/mainwindow.cpp 2009-03-12 14:49:29.358749429 +0100
@@ -59,7 +59,7 @@
 #include <QMessageBox>
 #include <QStyle>
 #include <QtEvents>
-#include <Q3ValueList>
+#include <QList>
 #include <QInputContext>
 #include <QInputContextFactory>
 #include <QtDebug>
@@ -152,32 +152,32 @@ static const char *phonon_text =
 "<p>It is reccommended to leave all settings on \"Auto\" to let "
 "Phonon determine your settings automatically.";
 
-static QColorGroup::ColorRole centralFromItem( int item )
+static QPalette::ColorRole centralFromItem( int item )
 {
     switch( item ) {
-    case 0:  return QColorGroup::Window;
-    case 1:  return QColorGroup::WindowText;
-    case 2:  return QColorGroup::Button;
-    case 3:  return QColorGroup::Base;
-    case 4:  return QColorGroup::Text;
-    case 5:  return QColorGroup::BrightText;
-    case 6:  return QColorGroup::ButtonText;
-    case 7:  return QColorGroup::Highlight;
-    case 8:  return QColorGroup::HighlightedText;
-    default: return QColorGroup::NColorRoles;
+    case 0:  return QPalette::Window;
+    case 1:  return QPalette::WindowText;
+    case 2:  return QPalette::Button;
+    case 3:  return QPalette::Base;
+    case 4:  return QPalette::Text;
+    case 5:  return QPalette::BrightText;
+    case 6:  return QPalette::ButtonText;
+    case 7:  return QPalette::Highlight;
+    case 8:  return QPalette::HighlightedText;
+    default: return QPalette::NColorRoles;
     }
 }
 
 
-static QColorGroup::ColorRole effectFromItem( int item )
+static QPalette::ColorRole effectFromItem( int item )
 {
     switch( item ) {
-    case 0:  return QColorGroup::Light;
-    case 1:  return QColorGroup::Midlight;
-    case 2:  return QColorGroup::Mid;
-    case 3:  return QColorGroup::Dark;
-    case 4:  return QColorGroup::Shadow;
-    default: return QColorGroup::NColorRoles;
+    case 0:  return QPalette::Light;
+    case 1:  return QPalette::Midlight;
+    case 2:  return QPalette::Mid;
+    case 3:  return QPalette::Dark;
+    case 4:  return QPalette::Shadow;
+    default: return QPalette::NColorRoles;
     }
 }
 
@@ -205,28 +205,28 @@ MainWindow::MainWindow()
     gstylecombo->addItem(desktopThemeName);
     gstylecombo->setItemData(gstylecombo->findText(desktopThemeName),
                                 tr("Choose style and palette based on your desktop settings."), Qt::ToolTipRole);
-    gstylecombo->insertStringList(gstyles);
+    gstylecombo->insertItems(-1, gstyles);
 
     QSettings settings(QLatin1String("Trolltech"));
     settings.beginGroup(QLatin1String("Qt"));
 
     QString currentstyle = settings.value(QLatin1String("style")).toString();
     if (currentstyle.isEmpty()) {
-        gstylecombo->setCurrentItem(gstylecombo->findText(desktopThemeName));
-        currentstyle = QLatin1String(QApplication::style()->name());
+        gstylecombo->setCurrentIndex(gstylecombo->findText(desktopThemeName));
+        currentstyle = QApplication::style()->objectName();
     } else {
         int index = gstylecombo->findText(currentstyle, Qt::MatchFixedString);
         if (index != -1) {
-            gstylecombo->setCurrentItem(index);
+            gstylecombo->setCurrentIndex(index);
         } else { // we give up
-            gstylecombo->insertItem(QLatin1String("Unknown"));
-            gstylecombo->setCurrentItem(gstylecombo->count() - 1);
+            gstylecombo->insertItem(-1, QLatin1String("Unknown"));
+            gstylecombo->setCurrentIndex(gstylecombo->count() - 1);
         }
     }
     buttonMainColor->setColor(palette().color(QPalette::Active,
-                                              QColorGroup::Button));
+                                              QPalette::Button));
     buttonMainColor2->setColor(palette().color(QPalette::Active,
-                                               QColorGroup::Window));
+                                               QPalette::Window));
     connect(buttonMainColor, SIGNAL(colorChanged(QColor)),
                 this, SLOT(buildPalette()));
     connect(buttonMainColor2, SIGNAL(colorChanged(QColor)),
@@ -239,7 +239,7 @@ MainWindow::MainWindow()
 
     QFontDatabase db;
     QStringList families = db.families();
-    familycombo->insertStringList(families);
+    familycombo->insertItems(-1, families);
 
     QStringList fs = families;
     QStringList fs2 = QFont::substitutions();
@@ -250,13 +250,13 @@ MainWindow::MainWindow()
         fsit++;
     }
     fs.sort();
-    familysubcombo->insertStringList(fs);
+    familysubcombo->insertItems(-1, fs);
 
-    choosesubcombo->insertStringList(families);
-    Q3ValueList<int> sizes = db.standardSizes();
-    Q3ValueList<int>::Iterator it = sizes.begin();
+    choosesubcombo->insertItems(-1, families);
+    QList<int> sizes = db.standardSizes();
+    QList<int>::Iterator it = sizes.begin();
     while (it != sizes.end())
-        psizecombo->insertItem(QString::number(*it++));
+        psizecombo->insertItem(-1, QString::number(*it++));
 
     dcispin->setValue(QApplication::doubleClickInterval());
     cfispin->setValue(QApplication::cursorFlashTime());
@@ -268,20 +268,20 @@ MainWindow::MainWindow()
     effectbase->setEnabled(effectcheckbox->isChecked());
 
     if (QApplication::isEffectEnabled(Qt::UI_FadeMenu))
-        menueffect->setCurrentItem(2);
+        menueffect->setCurrentIndex(2);
     else if (QApplication::isEffectEnabled(Qt::UI_AnimateMenu))
-        menueffect->setCurrentItem(1);
+        menueffect->setCurrentIndex(1);
 
     if (QApplication::isEffectEnabled(Qt::UI_AnimateCombo))
-        comboeffect->setCurrentItem(1);
+        comboeffect->setCurrentIndex(1);
 
     if (QApplication::isEffectEnabled(Qt::UI_FadeTooltip))
-        tooltipeffect->setCurrentItem(2);
+        tooltipeffect->setCurrentIndex(2);
     else if (QApplication::isEffectEnabled(Qt::UI_AnimateTooltip))
-        tooltipeffect->setCurrentItem(1);
+        tooltipeffect->setCurrentIndex(1);
 
     if ( QApplication::isEffectEnabled( Qt::UI_AnimateToolBox ) )
-        toolboxeffect->setCurrentItem( 1 );
+        toolboxeffect->setCurrentIndex( 1 );
 
     QSize globalStrut = QApplication::globalStrut();
     strutwidth->setValue(globalStrut.width());
@@ -304,10 +304,10 @@ MainWindow::MainWindow()
     if (i == -1) // no clue about the current font
         i = 0;
 
-    familycombo->setCurrentItem(i);
+    familycombo->setCurrentIndex(i);
 
     QStringList styles = db.styles(familycombo->currentText());
-    stylecombo->insertStringList(styles);
+    stylecombo->insertItems(-1, styles);
 
     QString stylestring = db.styleString(QApplication::font());
     sit = styles.begin();
@@ -326,29 +326,29 @@ MainWindow::MainWindow()
         i = possible;
     if (i == -1) // no clue about the current font
         i = 0;
-    stylecombo->setCurrentItem(i);
+    stylecombo->setCurrentIndex(i);
 
     i = 0;
     for (int psize = QApplication::font().pointSize(); i < psizecombo->count(); ++i) {
-        const int sz = psizecombo->text(i).toInt();
+        const int sz = psizecombo->itemText(i).toInt();
         if (sz == psize) {
-            psizecombo->setCurrentItem(i);
+            psizecombo->setCurrentIndex(i);
             break;
         } else if(sz > psize) {
             psizecombo->insertItem(i, QString::number(psize));
-            psizecombo->setCurrentItem(i);
+            psizecombo->setCurrentIndex(i);
             break;
         }
     }
 
     QStringList subs = QFont::substitutes(familysubcombo->currentText());
     sublistbox->clear();
-    sublistbox->insertStringList(subs);
+    sublistbox->insertItems(-1, subs);
 
     rtlExtensions->setChecked(settings.value(QLatin1String("useRtlExtensions"), false).toBool());
 
 #ifdef Q_WS_X11
-    inputStyle->setCurrentText(settings.value(QLatin1String("XIMInputStyle"), trUtf8("On The Spot")).toString());
+    inputStyle->setItemText(inputStyle->currentIndex(), settings.value(QLatin1String("XIMInputStyle"), trUtf8("On The Spot")).toString());
 #else
     inputStyle->hide();
     inputStyleLabel->hide();
@@ -379,7 +379,7 @@ MainWindow::MainWindow()
 
     fontembeddingcheckbox->setChecked(settings.value(QLatin1String("embedFonts"), true).toBool());
     fontpaths = settings.value(QLatin1String("fontPath")).toStringList();
-    fontpathlistbox->insertStringList(fontpaths);
+    fontpathlistbox->insertItems(-1, fontpaths);
 
     audiosinkCombo->addItem(tr("Auto (default)"), QLatin1String("Auto"));
     audiosinkCombo->setItemData(audiosinkCombo->findText(tr("Auto (default)")),
@@ -435,8 +435,8 @@ MainWindow::MainWindow()
 
     QString audioSink = settings.value(QLatin1String("audiosink"), QLatin1String("Auto")).toString();
     QString videoMode = settings.value(QLatin1String("videomode"), QLatin1String("Auto")).toString();
-    audiosinkCombo->setCurrentItem(audiosinkCombo->findData(audioSink));
-    videomodeCombo->setCurrentItem(videomodeCombo->findData(videoMode));
+    audiosinkCombo->setCurrentIndex(audiosinkCombo->findData(audioSink));
+    videomodeCombo->setCurrentIndex(videomodeCombo->findData(videoMode));
 
     settings.endGroup(); // Qt
 
@@ -476,15 +476,15 @@ void MainWindow::fileSave()
         bool overrideDesktopSettings = (gstylecombo->currentText() != desktopThemeName);
         if (overrideDesktopSettings) {
             int i;
-            for (i = 0; i < QColorGroup::NColorRoles; i++)
+            for (i = 0; i <= QPalette::NoRole; i++)
                 actcg << editPalette.color(QPalette::Active,
-                                           (QColorGroup::ColorRole) i).name();
-            for (i = 0; i < QColorGroup::NColorRoles; i++)
+                                           (QPalette::ColorRole) i).name();
+            for (i = 0; i <= QPalette::NoRole; i++)
                 inactcg << editPalette.color(QPalette::Inactive,
-                                             (QColorGroup::ColorRole) i).name();
-            for (i = 0; i < QColorGroup::NColorRoles; i++)
+                                             (QPalette::ColorRole) i).name();
+            for (i = 0; i <= QPalette::NoRole; i++)
                 discg << editPalette.color(QPalette::Disabled,
-                                           (QColorGroup::ColorRole) i).name();
+                                           (QPalette::ColorRole) i).name();
         }
 
         settings.setValue(QLatin1String("font"), font.toString());
@@ -531,21 +531,21 @@ void MainWindow::fileSave()
         if (effectcheckbox->isChecked()) {
             effects << QLatin1String("general");
 
-            switch (menueffect->currentItem()) {
+            switch (menueffect->currentIndex()) {
             case 1: effects << QLatin1String("animatemenu"); break;
             case 2: effects << QLatin1String("fademenu"); break;
             }
 
-            switch (comboeffect->currentItem()) {
+            switch (comboeffect->currentIndex()) {
             case 1: effects << QLatin1String("animatecombo"); break;
             }
 
-            switch (tooltipeffect->currentItem()) {
+            switch (tooltipeffect->currentIndex()) {
             case 1: effects << QLatin1String("animatetooltip"); break;
             case 2: effects << QLatin1String("fadetooltip"); break;
             }
 
-            switch ( toolboxeffect->currentItem() ) {
+            switch ( toolboxeffect->currentIndex() ) {
             case 1: effects << QLatin1String("animatetoolbox"); break;
             }
         } else
@@ -592,34 +592,26 @@ void MainWindow::setModified(bool m)
 void MainWindow::buildPalette()
 {
     int i;
-    QColorGroup cg;
     QColor btn = buttonMainColor->color();
     QColor back = buttonMainColor2->color();
     QPalette automake( btn, back );
 
     for (i = 0; i<9; i++)
-        cg.setColor( centralFromItem(i), automake.active().color( centralFromItem(i) ) );
+        editPalette.setColor( QPalette::Active, centralFromItem(i), automake.color( QPalette::Active, centralFromItem(i) ) );
 
-    editPalette.setActive( cg );
     buildActiveEffect();
 
-    cg = editPalette.inactive();
-
-    QPalette temp( editPalette.active().color( QColorGroup::Button ),
-                   editPalette.active().color( QColorGroup::Window ) );
+    QPalette temp( editPalette.color( QPalette::Active, QPalette::Button ),
+                   editPalette.color( QPalette::Active, QPalette::Window ) );
 
     for (i = 0; i<9; i++)
-        cg.setColor( centralFromItem(i), temp.inactive().color( centralFromItem(i) ) );
+        editPalette.setColor( QPalette::Inactive, centralFromItem(i), temp.color( QPalette::Inactive, centralFromItem(i) ) );
 
-    editPalette.setInactive( cg );
     buildInactiveEffect();
 
-    cg = editPalette.disabled();
-
     for (i = 0; i<9; i++)
-        cg.setColor( centralFromItem(i), temp.disabled().color( centralFromItem(i) ) );
+        editPalette.setColor( QPalette::Disabled, centralFromItem(i), temp.color( QPalette::Disabled, centralFromItem(i) ) );
 
-    editPalette.setDisabled( cg );
     buildDisabledEffect();
 
     updateColorButtons();
@@ -630,15 +622,13 @@ void MainWindow::buildPalette()
 
 void MainWindow::buildActiveEffect()
 {
-    QColorGroup cg = editPalette.active();
-    QColor btn = cg.color( QColorGroup::Button );
+    QColor btn = editPalette.color( QPalette::Active, QPalette::Button );
 
     QPalette temp( btn, btn );
 
     for (int i = 0; i<5; i++)
-        cg.setColor( effectFromItem(i), temp.active().color( effectFromItem(i) ) );
+        editPalette.setColor( QPalette::Active, effectFromItem(i), temp.color( QPalette::Active, effectFromItem(i) ) );
 
-    editPalette.setActive( cg );
     setPreviewPalette( editPalette );
 
     updateColorButtons();
@@ -647,17 +637,16 @@ void MainWindow::buildActiveEffect()
 
 void MainWindow::buildInactive()
 {
-    editPalette.setInactive( editPalette.active() );
+    for(int i=0; i<=QPalette::NoRole; i++)
+        editPalette.setColor(QPalette::Inactive, (QPalette::ColorRole)i, editPalette.color(QPalette::Active, (QPalette::ColorRole)i));
     buildInactiveEffect();
 }
 
 
 void MainWindow::buildInactiveEffect()
 {
-    QColorGroup cg = editPalette.inactive();
-
     QColor light, midlight, mid, dark, shadow;
-    QColor btn = cg.color( QColorGroup::Button );
+    QColor btn = editPalette.color( QPalette::Inactive, QPalette::Button );
 
     light = btn.light(150);
     midlight = btn.light(115);
@@ -665,13 +654,12 @@ void MainWindow::buildInactiveEffect()
     dark = btn.dark();
     shadow = Qt::black;
 
-    cg.setColor( QColorGroup::Light, light );
-    cg.setColor( QColorGroup::Midlight, midlight );
-    cg.setColor( QColorGroup::Mid, mid );
-    cg.setColor( QColorGroup::Dark, dark );
-    cg.setColor( QColorGroup::Shadow, shadow );
+    editPalette.setColor( QPalette::Inactive, QPalette::Light, light );
+    editPalette.setColor( QPalette::Inactive, QPalette::Midlight, midlight );
+    editPalette.setColor( QPalette::Inactive, QPalette::Mid, mid );
+    editPalette.setColor( QPalette::Inactive, QPalette::Dark, dark );
+    editPalette.setColor( QPalette::Inactive, QPalette::Shadow, shadow );
 
-    editPalette.setInactive( cg );
     setPreviewPalette( editPalette );
     updateColorButtons();
 }
@@ -679,12 +667,12 @@ void MainWindow::buildInactiveEffect()
 
 void MainWindow::buildDisabled()
 {
-    QColorGroup cg = editPalette.active();
-    cg.setColor( QColorGroup::ButtonText, Qt::darkGray );
-    cg.setColor( QColorGroup::WindowText, Qt::darkGray );
-    cg.setColor( QColorGroup::Text, Qt::darkGray );
-    cg.setColor( QColorGroup::HighlightedText, Qt::darkGray );
-    editPalette.setDisabled( cg );
+    for(int i=0; i<=QPalette::NoRole; i++)
+        editPalette.setColor(QPalette::Disabled, (QPalette::ColorRole)i, editPalette.color(QPalette::Active, (QPalette::ColorRole)i));
+    editPalette.setColor( QPalette::Disabled, QPalette::ButtonText, Qt::darkGray );
+    editPalette.setColor( QPalette::Disabled, QPalette::WindowText, Qt::darkGray );
+    editPalette.setColor( QPalette::Disabled, QPalette::Text, Qt::darkGray );
+    editPalette.setColor( QPalette::Disabled, QPalette::HighlightedText, Qt::darkGray );
 
     buildDisabledEffect();
 }
@@ -692,10 +680,8 @@ void MainWindow::buildDisabled()
 
 void MainWindow::buildDisabledEffect()
 {
-    QColorGroup cg = editPalette.disabled();
-
     QColor light, midlight, mid, dark, shadow;
-    QColor btn = cg.color( QColorGroup::Button );
+    QColor btn = editPalette.color( QPalette::Disabled, QPalette::Button );
 
     light = btn.light(150);
     midlight = btn.light(115);
@@ -703,13 +689,12 @@ void MainWindow::buildDisabledEffect()
     dark = btn.dark();
     shadow = Qt::black;
 
-    cg.setColor( QColorGroup::Light, light );
-    cg.setColor( QColorGroup::Midlight, midlight );
-    cg.setColor( QColorGroup::Mid, mid );
-    cg.setColor( QColorGroup::Dark, dark );
-    cg.setColor( QColorGroup::Shadow, shadow );
+    editPalette.setColor( QPalette::Disabled, QPalette::Light, light );
+    editPalette.setColor( QPalette::Disabled, QPalette::Midlight, midlight );
+    editPalette.setColor( QPalette::Disabled, QPalette::Mid, mid );
+    editPalette.setColor( QPalette::Disabled, QPalette::Dark, dark );
+    editPalette.setColor( QPalette::Disabled, QPalette::Shadow, shadow );
 
-    editPalette.setDisabled( cg );
     setPreviewPalette( editPalette );
     updateColorButtons();
 }
@@ -717,23 +702,25 @@ void MainWindow::buildDisabledEffect()
 
 void MainWindow::setPreviewPalette( const QPalette& pal )
 {
-    QColorGroup cg;
+    QPalette::ColorGroup cg;
 
-    switch (paletteCombo->currentItem()) {
+    switch (paletteCombo->currentIndex()) {
     case 0:
     default:
-        cg = pal.active();
+        cg = QPalette::Active;
         break;
     case 1:
-        cg = pal.inactive();
+        cg = QPalette::Inactive;
         break;
     case 2:
-        cg = pal.disabled();
+        cg = QPalette::Disabled;
         break;
     }
-    previewPalette.setActive( cg );
-    previewPalette.setInactive( cg );
-    previewPalette.setDisabled( cg );
+    for(int i=0; i<QPalette::NoRole; i++) {
+        previewPalette.setColor(QPalette::Active, (QPalette::ColorRole)i, pal.color(cg, (QPalette::ColorRole)i));
+        previewPalette.setColor(QPalette::Inactive, (QPalette::ColorRole)i, pal.color(cg, (QPalette::ColorRole)i));
+        previewPalette.setColor(QPalette::Disabled, (QPalette::ColorRole)i, pal.color(cg, (QPalette::ColorRole)i));
+    }
 
     previewFrame->setPreviewPalette(previewPalette);
 }
@@ -741,8 +728,8 @@ void MainWindow::setPreviewPalette( cons
 
 void MainWindow::updateColorButtons()
 {
-    buttonMainColor->setColor( editPalette.active().color( QColorGroup::Button ));
-    buttonMainColor2->setColor( editPalette.active().color( QColorGroup::Window ));
+    buttonMainColor->setColor( editPalette.color( QPalette::Active, QPalette::Button ));
+    buttonMainColor2->setColor( editPalette.color( QPalette::Active, QPalette::Window ));
 }
 
 
@@ -750,7 +737,7 @@ void MainWindow::tunePalette()
 {
     bool ok;
     QPalette pal = PaletteEditorAdvanced::getPalette(&ok, editPalette,
-                                                     backgroundMode(), this);
+                                                     backgroundRole(), this);
     if (! ok)
         return;
 
@@ -796,8 +783,8 @@ void MainWindow::familySelected(const QS
     QFontDatabase db;
     QStringList styles = db.styles(family);
     stylecombo->clear();
-    stylecombo->insertStringList(styles);
-    familysubcombo->insertItem(family);
+    stylecombo->insertItems(-1, styles);
+    familysubcombo->insertItem(-1, family);
     buildFont();
 }
 
@@ -817,24 +804,24 @@ void MainWindow::substituteSelected(cons
 {
     QStringList subs = QFont::substitutes(family);
     sublistbox->clear();
-    sublistbox->insertStringList(subs);
+    sublistbox->insertItems(-1, subs);
 }
 
 
 void MainWindow::removeSubstitute()
 {
-    if (sublistbox->currentItem() < 0 ||
-        uint(sublistbox->currentItem()) > sublistbox->count())
+    if (sublistbox->currentRow() < 0 ||
+        uint(sublistbox->currentRow()) > sublistbox->count())
         return;
 
-    int item = sublistbox->currentItem();
+    int item = sublistbox->currentRow();
     QStringList subs = QFont::substitutes(familysubcombo->currentText());
-    subs.remove(subs.at(sublistbox->currentItem()));
+    subs.removeAt(sublistbox->currentRow());
     sublistbox->clear();
-    sublistbox->insertStringList(subs);
+    sublistbox->insertItems(-1, subs);
     if (uint(item) > sublistbox->count())
         item = int(sublistbox->count()) - 1;
-    sublistbox->setCurrentItem(item);
+    sublistbox->setCurrentRow(item);
     QFont::removeSubstitution(familysubcombo->currentText());
     QFont::insertSubstitutions(familysubcombo->currentText(), subs);
     setModified(true);
@@ -843,40 +830,40 @@ void MainWindow::removeSubstitute()
 
 void MainWindow::addSubstitute()
 {
-    if (sublistbox->currentItem() < 0 ||
-        uint(sublistbox->currentItem()) > sublistbox->count()) {
+    if (sublistbox->currentRow() < 0 ||
+        uint(sublistbox->currentRow()) > sublistbox->count()) {
         QFont::insertSubstitution(familysubcombo->currentText(), choosesubcombo->currentText());
         QStringList subs = QFont::substitutes(familysubcombo->currentText());
         sublistbox->clear();
-        sublistbox->insertStringList(subs);
+        sublistbox->insertItems(-1, subs);
         setModified(true);
         return;
     }
 
-    int item = sublistbox->currentItem();
+    int item = sublistbox->currentRow();
     QFont::insertSubstitution(familysubcombo->currentText(), choosesubcombo->currentText());
     QStringList subs = QFont::substitutes(familysubcombo->currentText());
     sublistbox->clear();
-    sublistbox->insertStringList(subs);
-    sublistbox->setCurrentItem(item);
+    sublistbox->insertItems(-1, subs);
+    sublistbox->setCurrentRow(item);
     setModified(true);
 }
 
 
 void MainWindow::downSubstitute()
 {
-    if (sublistbox->currentItem() < 0 ||
-        uint(sublistbox->currentItem()) >= sublistbox->count())
+    if (sublistbox->currentRow() < 0 ||
+        uint(sublistbox->currentRow()) >= sublistbox->count())
         return;
 
-    int item = sublistbox->currentItem();
+    int item = sublistbox->currentRow();
     QStringList subs = QFont::substitutes(familysubcombo->currentText());
     QString fam = subs.at(item);
     subs.removeAt(item);
     subs.insert(item+1, fam);
     sublistbox->clear();
-    sublistbox->insertStringList(subs);
-    sublistbox->setCurrentItem(item + 1);
+    sublistbox->insertItems(-1, subs);
+    sublistbox->setCurrentRow(item + 1);
     QFont::removeSubstitution(familysubcombo->currentText());
     QFont::insertSubstitutions(familysubcombo->currentText(), subs);
     setModified(true);
@@ -885,17 +872,17 @@ void MainWindow::downSubstitute()
 
 void MainWindow::upSubstitute()
 {
-    if (sublistbox->currentItem() < 1)
+    if (sublistbox->currentRow() < 1)
         return;
 
-    int item = sublistbox->currentItem();
+    int item = sublistbox->currentRow();
     QStringList subs = QFont::substitutes(familysubcombo->currentText());
     QString fam = subs.at(item);
     subs.removeAt(item);
     subs.insert(item-1, fam);
     sublistbox->clear();
-    sublistbox->insertStringList(subs);
-    sublistbox->setCurrentItem(item - 1);
+    sublistbox->insertItems(-1, subs);
+    sublistbox->setCurrentRow(item - 1);
     QFont::removeSubstitution(familysubcombo->currentText());
     QFont::insertSubstitutions(familysubcombo->currentText(), subs);
     setModified(true);
@@ -904,17 +891,17 @@ void MainWindow::upSubstitute()
 
 void MainWindow::removeFontpath()
 {
-    if (fontpathlistbox->currentItem() < 0 ||
-        uint(fontpathlistbox->currentItem()) > fontpathlistbox->count())
+    if (fontpathlistbox->currentRow() < 0 ||
+        uint(fontpathlistbox->currentRow()) > fontpathlistbox->count())
         return;
 
-    int item = fontpathlistbox->currentItem();
-    fontpaths.remove(fontpaths.at(fontpathlistbox->currentItem()));
+    int item = fontpathlistbox->currentRow();
+    fontpaths.removeAt(fontpathlistbox->currentRow());
     fontpathlistbox->clear();
-    fontpathlistbox->insertStringList(fontpaths);
+    fontpathlistbox->insertItems(-1, fontpaths);
     if (uint(item) > fontpathlistbox->count())
         item = int(fontpathlistbox->count()) - 1;
-    fontpathlistbox->setCurrentItem(item);
+    fontpathlistbox->setCurrentRow(item);
     setModified(true);
 }
 
@@ -924,62 +911,62 @@ void MainWindow::addFontpath()
     if (fontpathlineedit->text().isEmpty())
         return;
 
-    if (fontpathlistbox->currentItem() < 0 ||
-        uint(fontpathlistbox->currentItem()) > fontpathlistbox->count()) {
+    if (fontpathlistbox->currentRow() < 0 ||
+        uint(fontpathlistbox->currentRow()) > fontpathlistbox->count()) {
         fontpaths.append(fontpathlineedit->text());
         fontpathlistbox->clear();
-        fontpathlistbox->insertStringList(fontpaths);
+        fontpathlistbox->insertItems(-1, fontpaths);
         setModified(true);
 
         return;
     }
 
-    int item = fontpathlistbox->currentItem();
-    fontpaths.insert(fontpathlistbox->currentItem()+1,
+    int item = fontpathlistbox->currentRow();
+    fontpaths.insert(fontpathlistbox->currentRow()+1,
                      fontpathlineedit->text());
     fontpathlistbox->clear();
-    fontpathlistbox->insertStringList(fontpaths);
-    fontpathlistbox->setCurrentItem(item);
+    fontpathlistbox->insertItems(-1, fontpaths);
+    fontpathlistbox->setCurrentRow(item);
     setModified(true);
 }
 
 
 void MainWindow::downFontpath()
 {
-    if (fontpathlistbox->currentItem() < 0 ||
-        uint(fontpathlistbox->currentItem()) >= fontpathlistbox->count() - 1)
+    if (fontpathlistbox->currentRow() < 0 ||
+        uint(fontpathlistbox->currentRow()) >= fontpathlistbox->count() - 1)
         return;
 
-    int item = fontpathlistbox->currentItem();
+    int item = fontpathlistbox->currentRow();
     QString fam = fontpaths.at(item);
     fontpaths.removeAt(item);
     fontpaths.insert(item+1, fam);
     fontpathlistbox->clear();
-    fontpathlistbox->insertStringList(fontpaths);
-    fontpathlistbox->setCurrentItem(item + 1);
+    fontpathlistbox->insertItems(-1, fontpaths);
+    fontpathlistbox->setCurrentRow(item + 1);
     setModified(true);
 }
 
 
 void MainWindow::upFontpath()
 {
-    if (fontpathlistbox->currentItem() < 1)
+    if (fontpathlistbox->currentRow() < 1)
         return;
 
-    int item = fontpathlistbox->currentItem();
+    int item = fontpathlistbox->currentRow();
     QString fam = fontpaths.at(item);
     fontpaths.removeAt(item);
     fontpaths.insert(item-1, fam);
     fontpathlistbox->clear();
-    fontpathlistbox->insertStringList(fontpaths);
-    fontpathlistbox->setCurrentItem(item - 1);
+    fontpathlistbox->insertItems(-1, fontpaths);
+    fontpathlistbox->setCurrentRow(item - 1);
     setModified(true);
 }
 
 
 void MainWindow::browseFontpath()
 {
-    QString dirname = QFileDialog::getExistingDirectory(QString(), this, 0,
+    QString dirname = QFileDialog::getExistingDirectory(this,
                                                         tr("Select a Directory"));
     if (dirname.isNull())
         return;
--- qt-x11-opensource-src-4.5.0/tools/qtconfig/paletteeditoradvancedbase.cpp.ark 2009-03-12 15:13:46.242753803 +0100
+++ qt-x11-opensource-src-4.5.0/tools/qtconfig/paletteeditoradvancedbase.cpp 2009-03-12 15:13:03.421743822 +0100
@@ -54,8 +54,9 @@ QT_BEGIN_NAMESPACE
  *  true to construct a modal dialog.
  */
 PaletteEditorAdvancedBase::PaletteEditorAdvancedBase(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)
-    : QDialog(parent, name, modal, fl)
+    : QDialog(parent, fl)
 {
+    setModal(modal);
     setupUi(this);
 
 
--- qt-x11-opensource-src-4.5.0/tools/qtconfig/paletteeditoradvancedbase.ui.ark 2009-03-12 13:36:55.448993156 +0100
+++ qt-x11-opensource-src-4.5.0/tools/qtconfig/paletteeditoradvancedbase.ui 2009-03-12 13:44:45.135208784 +0100
@@ -125,7 +125,7 @@
         </layout>
       </item>
       <item>
-        <widget class="Q3ButtonGroup" name="ButtonGroup1" >
+        <widget class="QGroupBox" name="ButtonGroup1" >
           <property name="objectName" >
             <string notr="true" >ButtonGroup1</string>
           </property>
@@ -180,7 +180,7 @@
         </widget>
       </item>
       <item>
-        <widget class="Q3GroupBox" name="groupCentral" >
+        <widget class="QGroupBox" name="groupCentral" >
           <property name="objectName" >
             <string notr="true" >groupCentral</string>
           </property>
@@ -339,7 +339,7 @@
         </widget>
       </item>
       <item>
-        <widget class="Q3GroupBox" name="groupEffect" >
+        <widget class="QGroupBox" name="groupEffect" >
           <property name="objectName" >
             <string notr="true" >groupEffect</string>
           </property>
--- qt-x11-opensource-src-4.5.0/tools/qtconfig/paletteeditoradvanced.cpp.ark 2009-03-12 14:49:51.369742968 +0100
+++ qt-x11-opensource-src-4.5.0/tools/qtconfig/paletteeditoradvanced.cpp 2009-03-12 15:12:02.663359811 +0100
@@ -155,47 +155,47 @@ void PaletteEditorAdvanced::onToggleBuil
     buildDisabledEffect();
 }
 
-QColorGroup::ColorRole PaletteEditorAdvanced::centralFromItem( int item )
+QPalette::ColorRole PaletteEditorAdvanced::centralFromItem( int item )
 {
     switch( item ) {
         case 0:
-            return QColorGroup::Window;
+            return QPalette::Window;
         case 1:
-            return QColorGroup::WindowText;
+            return QPalette::WindowText;
         case 2:
-            return QColorGroup::Button;
+            return QPalette::Button;
         case 3:
-            return QColorGroup::Base;
+            return QPalette::Base;
         case 4:
-            return QColorGroup::Text;
+            return QPalette::Text;
         case 5:
-            return QColorGroup::BrightText;
+            return QPalette::BrightText;
         case 6:
-            return QColorGroup::ButtonText;
+            return QPalette::ButtonText;
         case 7:
-            return QColorGroup::Highlight;
+            return QPalette::Highlight;
         case 8:
-            return QColorGroup::HighlightedText;
+            return QPalette::HighlightedText;
         default:
-            return QColorGroup::NColorRoles;
+            return QPalette::NColorRoles;
     }
 }
 
-QColorGroup::ColorRole PaletteEditorAdvanced::effectFromItem( int item )
+QPalette::ColorRole PaletteEditorAdvanced::effectFromItem( int item )
 {
     switch( item ) {
     case 0:
-        return QColorGroup::Light;
+        return QPalette::Light;
     case 1:
-        return QColorGroup::Midlight;
+        return QPalette::Midlight;
     case 2:
-        return QColorGroup::Mid;
+        return QPalette::Mid;
     case 3:
-        return QColorGroup::Dark;
+        return QPalette::Dark;
     case 4:
-        return QColorGroup::Shadow;
+        return QPalette::Shadow;
     default:
-        return QColorGroup::NColorRoles;
+        return QPalette::NColorRoles;
     }
 }
 
@@ -206,13 +206,13 @@ void PaletteEditorAdvanced::onCentral( i
     switch(selectedPalette) {
     case 0:
     default:
-        c = editPalette.active().color( centralFromItem(item) );
+        c = editPalette.color( QPalette::Active, centralFromItem(item) );
         break;
     case 1:
-        c = editPalette.inactive().color( centralFromItem(item) );
+        c = editPalette.color( QPalette::Inactive, centralFromItem(item) );
         break;
     case 2:
-        c =  editPalette.disabled().color( centralFromItem(item) );
+        c =  editPalette.color( QPalette::Disabled, centralFromItem(item) );
         break;
     }
 
@@ -225,13 +225,13 @@ void PaletteEditorAdvanced::onEffect( in
     switch(selectedPalette) {
     case 0:
     default:
-        c = editPalette.active().color( effectFromItem(item) );
+        c = editPalette.color( QPalette::Active, effectFromItem(item) );
         break;
     case 1:
-        editPalette.inactive().color( effectFromItem(item) );
+        editPalette.color( QPalette::Inactive, effectFromItem(item) );
         break;
     case 2:
-        editPalette.disabled().color( effectFromItem(item) );
+        editPalette.color( QPalette::Disabled, effectFromItem(item) );
         break;
     }
     buttonEffect->setColor(c);
@@ -239,9 +239,7 @@ void PaletteEditorAdvanced::onEffect( in
 
 void PaletteEditorAdvanced::mapToActiveCentralRole( const QColor& c )
 {
-    QColorGroup cg = editPalette.active();
-    cg.setColor( centralFromItem(comboCentral->currentItem()), c );
-    editPalette.setActive( cg );
+    editPalette.setColor( QPalette::Active, centralFromItem(comboCentral->currentIndex()), c );
 
     buildActiveEffect();
     if(checkBuildInactive->isChecked())
@@ -254,9 +252,7 @@ void PaletteEditorAdvanced::mapToActiveC
 
 void PaletteEditorAdvanced::mapToActiveEffectRole( const QColor& c )
 {
-    QColorGroup cg = editPalette.active();
-    cg.setColor( effectFromItem(comboEffect->currentItem()), c );
-    editPalette.setActive( cg );
+    editPalette.setColor( QPalette::Active, effectFromItem(comboEffect->currentIndex()), c );
 
     if(checkBuildInactive->isChecked())
         buildInactive();
@@ -268,13 +264,11 @@ void PaletteEditorAdvanced::mapToActiveE
 
 void PaletteEditorAdvanced::mapToActivePixmapRole( const QPixmap& pm )
 {
-    QColorGroup::ColorRole role = centralFromItem(comboCentral->currentItem());
-    QColorGroup cg = editPalette.active();
+    QPalette::ColorRole role = centralFromItem(comboCentral->currentIndex());
     if (  !pm.isNull()  )
-        cg.setBrush( role, QBrush( cg.color( role ), pm ) );
+        editPalette.setBrush( QPalette::Active, role, QBrush( editPalette.color( QPalette::Active, role ), pm ) );
     else
-        cg.setBrush( role, QBrush( cg.color( role ) ) );
-    editPalette.setActive( cg );
+        editPalette.setBrush( QPalette::Active, role, QBrush( editPalette.color( QPalette::Active, role ) ) );
 
 
     buildActiveEffect();
@@ -288,9 +282,7 @@ void PaletteEditorAdvanced::mapToActiveP
 
 void PaletteEditorAdvanced::mapToInactiveCentralRole( const QColor& c )
 {
-    QColorGroup cg = editPalette.inactive();
-    cg.setColor( centralFromItem(comboCentral->currentItem()), c );
-    editPalette.setInactive( cg );
+    editPalette.setColor( QPalette::Inactive, centralFromItem(comboCentral->currentIndex()), c );
 
     buildInactiveEffect();
 
@@ -299,31 +291,25 @@ void PaletteEditorAdvanced::mapToInactiv
 
 void PaletteEditorAdvanced::mapToInactiveEffectRole( const QColor& c )
 {
-    QColorGroup cg = editPalette.inactive();
-    cg.setColor( effectFromItem(comboEffect->currentItem()), c );
-    editPalette.setInactive( cg );
+    editPalette.setColor( QPalette::Inactive, effectFromItem(comboEffect->currentIndex()), c );
 
     setPreviewPalette( editPalette );
 }
 
 void PaletteEditorAdvanced::mapToInactivePixmapRole( const QPixmap& pm )
 {
-    QColorGroup::ColorRole role = centralFromItem(comboCentral->currentItem());
-    QColorGroup cg = editPalette.inactive();
+    QPalette::ColorRole role = centralFromItem(comboCentral->currentIndex());
     if (  !pm.isNull()  )
-        cg.setBrush( role, QBrush( cg.color( role ), pm ) );
+        editPalette.setBrush( QPalette::Inactive, role, QBrush( editPalette.color( QPalette::Inactive, role ), pm ) );
     else
-        cg.setBrush( role, QBrush( cg.color( role ) ) );
-    editPalette.setInactive( cg );
+        editPalette.setBrush( QPalette::Inactive, role, QBrush( editPalette.color( QPalette::Inactive, role ) ) );
 
     setPreviewPalette( editPalette );
 }
 
 void PaletteEditorAdvanced::mapToDisabledCentralRole( const QColor& c )
 {
-    QColorGroup cg = editPalette.disabled();
-    cg.setColor( centralFromItem(comboCentral->currentItem()), c );
-    editPalette.setDisabled( cg );
+    editPalette.setColor( QPalette::Disabled, centralFromItem(comboCentral->currentIndex()), c );
 
     buildDisabledEffect();
 
@@ -332,38 +318,32 @@ void PaletteEditorAdvanced::mapToDisable
 
 void PaletteEditorAdvanced::mapToDisabledEffectRole( const QColor& c )
 {
-    QColorGroup cg = editPalette.disabled();
-    cg.setColor( effectFromItem(comboEffect->currentItem()), c );
-    editPalette.setDisabled( cg );
+    editPalette.setColor( QPalette::Disabled, effectFromItem(comboEffect->currentIndex()), c );
 
     setPreviewPalette( editPalette );
 }
 
 void PaletteEditorAdvanced::mapToDisabledPixmapRole( const QPixmap& pm )
 {
-    QColorGroup::ColorRole role = centralFromItem(comboCentral->currentItem());
-    QColorGroup cg = editPalette.disabled();
+    QPalette::ColorRole role = centralFromItem(comboCentral->currentIndex());
     if (  !pm.isNull()  )
-        cg.setBrush( role, QBrush( cg.color( role ), pm ) );
+        editPalette.setBrush( QPalette::Disabled, role, QBrush( editPalette.color( QPalette::Disabled, role ), pm ) );
     else
-        cg.setBrush( role, QBrush( cg.color( role ) ) );
+        editPalette.setBrush( QPalette::Disabled, role, QBrush( editPalette.color( QPalette::Disabled, role ) ) );
 
-    editPalette.setDisabled( cg );
 
     setPreviewPalette( editPalette );
 }
 
 void PaletteEditorAdvanced::buildActiveEffect()
 {
-    QColorGroup cg = editPalette.active();
-    QColor btn = cg.color( QColorGroup::Button );
+    QColor btn = editPalette.color( QPalette::Active, QPalette::Button );
 
     QPalette temp( btn, btn );
 
     for (int i = 0; i<5; i++)
-        cg.setColor( effectFromItem(i), temp.active().color( effectFromItem(i) ) );
+        editPalette.setColor( QPalette::Active, effectFromItem(i), temp.color( QPalette::Active, effectFromItem(i) ) );
 
-    editPalette.setActive( cg );
     setPreviewPalette( editPalette );
 
     updateColorButtons();
@@ -371,7 +351,8 @@ void PaletteEditorAdvanced::buildActiveE
 
 void PaletteEditorAdvanced::buildInactive()
 {
-    editPalette.setInactive( editPalette.active() );
+    for(int i=0; i<=QPalette::NoRole; i++)
+        editPalette.setColor(QPalette::Inactive, (QPalette::ColorRole)i, editPalette.color(QPalette::Active, (QPalette::ColorRole(i))));
     if ( checkBuildEffect->isChecked() )
         buildInactiveEffect();
     else {
@@ -383,10 +364,8 @@ void PaletteEditorAdvanced::buildInactiv
 
 void PaletteEditorAdvanced::buildInactiveEffect()
 {
-    QColorGroup cg = editPalette.inactive();
-
     QColor light, midlight, mid, dark, shadow;
-    QColor btn = cg.color( QColorGroup::Button );
+    QColor btn = editPalette.color( QPalette::Inactive, QPalette::Button );
 
     light = btn.light(150);
     midlight = btn.light(115);
@@ -394,25 +373,24 @@ void PaletteEditorAdvanced::buildInactiv
     dark = btn.dark();
     shadow = Qt::black;
 
-    cg.setColor( QColorGroup::Light, light );
-    cg.setColor( QColorGroup::Midlight, midlight );
-    cg.setColor( QColorGroup::Mid, mid );
-    cg.setColor( QColorGroup::Dark, dark );
-    cg.setColor( QColorGroup::Shadow, shadow );
+    editPalette.setColor( QPalette::Inactive, QPalette::Light, light );
+    editPalette.setColor( QPalette::Inactive, QPalette::Midlight, midlight );
+    editPalette.setColor( QPalette::Inactive, QPalette::Mid, mid );
+    editPalette.setColor( QPalette::Inactive, QPalette::Dark, dark );
+    editPalette.setColor( QPalette::Inactive, QPalette::Shadow, shadow );
 
-    editPalette.setInactive( cg );
     setPreviewPalette( editPalette );
     updateColorButtons();
 }
 
 void PaletteEditorAdvanced::buildDisabled()
 {
-    QColorGroup cg = editPalette.active();
-    cg.setColor( QColorGroup::ButtonText, Qt::darkGray );
-    cg.setColor( QColorGroup::WindowText, Qt::darkGray );
-    cg.setColor( QColorGroup::Text, Qt::darkGray );
-    cg.setColor( QColorGroup::HighlightedText, Qt::darkGray );
-    editPalette.setDisabled( cg );
+    for(int i=0; i<=QPalette::NoRole; i++)
+        editPalette.setColor( QPalette::Disabled, (QPalette::ColorRole)i, editPalette.color( QPalette::Active, (QPalette::ColorRole)i));
+    editPalette.setColor( QPalette::Disabled, QPalette::ButtonText, Qt::darkGray );
+    editPalette.setColor( QPalette::Disabled, QPalette::WindowText, Qt::darkGray );
+    editPalette.setColor( QPalette::Disabled, QPalette::Text, Qt::darkGray );
+    editPalette.setColor( QPalette::Disabled, QPalette::HighlightedText, Qt::darkGray );
 
     if ( checkBuildEffect->isChecked() )
         buildDisabledEffect();
@@ -424,10 +402,8 @@ void PaletteEditorAdvanced::buildDisable
 
 void PaletteEditorAdvanced::buildDisabledEffect()
 {
-    QColorGroup cg = editPalette.disabled();
-
     QColor light, midlight, mid, dark, shadow;
-    QColor btn = cg.color( QColorGroup::Button );
+    QColor btn = editPalette.color( QPalette::Disabled, QPalette::Button );
 
     light = btn.light(150);
     midlight = btn.light(115);
@@ -435,36 +411,38 @@ void PaletteEditorAdvanced::buildDisable
     dark = btn.dark();
     shadow = Qt::black;
 
-    cg.setColor( QColorGroup::Light, light );
-    cg.setColor( QColorGroup::Midlight, midlight );
-    cg.setColor( QColorGroup::Mid, mid );
-    cg.setColor( QColorGroup::Dark, dark );
-    cg.setColor( QColorGroup::Shadow, shadow );
+    editPalette.setColor( QPalette::Disabled, QPalette::Light, light );
+    editPalette.setColor( QPalette::Disabled, QPalette::Midlight, midlight );
+    editPalette.setColor( QPalette::Disabled, QPalette::Mid, mid );
+    editPalette.setColor( QPalette::Disabled, QPalette::Dark, dark );
+    editPalette.setColor( QPalette::Disabled, QPalette::Shadow, shadow );
 
-    editPalette.setDisabled( cg );
     setPreviewPalette( editPalette );
     updateColorButtons();
 }
 
 void PaletteEditorAdvanced::setPreviewPalette( const QPalette& pal )
 {
-    QColorGroup cg;
+    QPalette::ColorGroup cg;
 
     switch (selectedPalette) {
     case 0:
     default:
-        cg = pal.active();
+        cg = QPalette::Active;
         break;
     case 1:
-        cg = pal.inactive();
+        cg = QPalette::Inactive;
         break;
     case 2:
-        cg = pal.disabled();
+        cg = QPalette::Disabled;
         break;
     }
-    previewPalette.setActive( cg );
-    previewPalette.setInactive( cg );
-    previewPalette.setDisabled( cg );
+
+    for(int i=0; i<=QPalette::NoRole; i++) {
+        previewPalette.setColor(QPalette::Active, (QPalette::ColorRole)i, previewPalette.color(cg, (QPalette::ColorRole)i));
+        previewPalette.setColor(QPalette::Inactive, (QPalette::ColorRole)i, previewPalette.color(cg, (QPalette::ColorRole)i));
+        previewPalette.setColor(QPalette::Disabled, (QPalette::ColorRole)i, previewPalette.color(cg, (QPalette::ColorRole)i));
+    }
 }
 
 void PaletteEditorAdvanced::updateColorButtons()
@@ -473,16 +451,16 @@ void PaletteEditorAdvanced::updateColorB
     switch (selectedPalette) {
     case 0:
     default:
-        central = editPalette.active().color( centralFromItem( comboCentral->currentItem() ) );
-        effect = editPalette.active().color( effectFromItem( comboEffect->currentItem() ) );
+        central = editPalette.color( QPalette::Active, centralFromItem( comboCentral->currentIndex() ) );
+        effect = editPalette.color( QPalette::Active, effectFromItem( comboEffect->currentIndex() ) );
         break;
     case 1:
-        central = editPalette.inactive().color( centralFromItem( comboCentral->currentItem() ) );
-        effect = editPalette.inactive().color( effectFromItem( comboEffect->currentItem() ) );
+        central = editPalette.color( QPalette::Inactive, centralFromItem( comboCentral->currentIndex() ) );
+        effect = editPalette.color( QPalette::Inactive, effectFromItem( comboEffect->currentIndex() ) );
         break;
     case 2:
-        central = editPalette.disabled().color( centralFromItem( comboCentral->currentItem() ) );
-        effect = editPalette.disabled().color( effectFromItem( comboEffect->currentItem() ) );
+        central = editPalette.color( QPalette::Disabled, centralFromItem( comboCentral->currentIndex() ) );
+        effect = editPalette.color( QPalette::Disabled, effectFromItem( comboEffect->currentIndex() ) );
         break;
     }
 
@@ -502,70 +480,22 @@ QPalette PaletteEditorAdvanced::pal() co
     return editPalette;
 }
 
-void PaletteEditorAdvanced::setupBackgroundMode( Qt::BackgroundMode mode )
+void PaletteEditorAdvanced::setupBackgroundMode( QPalette::ColorRole mode )
 {
     int initRole = 0;
 
-    switch( mode ) {
-    case Qt::PaletteBackground:
-        initRole = 0;
-        break;
-    case Qt::PaletteForeground:
-        initRole = 1;
-        break;
-    case Qt::PaletteButton:
-        initRole = 2;
-        break;
-    case Qt::PaletteBase:
-        initRole = 3;
-        break;
-    case Qt::PaletteText:
-        initRole = 4;
-        break;
-    case Qt::PaletteBrightText:
-        initRole = 5;
-        break;
-    case Qt::PaletteButtonText:
-        initRole = 6;
-        break;
-    case Qt::PaletteHighlight:
-        initRole = 7;
-        break;
-    case Qt::PaletteHighlightedText:
-        initRole = 8;
-        break;
-    case Qt::PaletteLight:
-        initRole = 9;
-        break;
-    case Qt::PaletteMidlight:
-        initRole = 10;
-        break;
-    case Qt::PaletteDark:
-        initRole = 11;
-        break;
-    case Qt::PaletteMid:
-        initRole = 12;
-        break;
-    case Qt::PaletteShadow:
-        initRole = 13;
-        break;
-    default:
-        initRole = -1;
-        break;
-    }
-
     if ( initRole <= -1 ) return;
 
     if (initRole > 8 ) {
-        comboEffect->setCurrentItem( initRole - 9 );
+        comboEffect->setCurrentIndex( mode - 9 );
     }
     else {
-        comboCentral->setCurrentItem( initRole );
+        comboCentral->setCurrentIndex( mode );
     }
 }
 
 QPalette PaletteEditorAdvanced::getPalette( bool *ok, const QPalette &init,
-                                            Qt::BackgroundMode mode, QWidget* parent,
+                                            QPalette::ColorRole mode, QWidget* parent,
                                             const char* name )
 {
     PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( parent, name, true );
--- qt-x11-opensource-src-4.5.0/tools/qtconfig/paletteeditoradvanced.h.ark 2009-03-12 13:46:05.912868468 +0100
+++ qt-x11-opensource-src-4.5.0/tools/qtconfig/paletteeditoradvanced.h 2009-03-12 13:48:36.392998595 +0100
@@ -54,7 +54,7 @@ public:
                            bool modal=false, Qt::WindowFlags f=0 );
     ~PaletteEditorAdvanced();
 
-    static QPalette getPalette( bool *ok, const QPalette &pal, Qt::BackgroundMode mode = Qt::PaletteBackground,
+    static QPalette getPalette( bool *ok, const QPalette &pal, QPalette::ColorRole mode = QPalette::Background,
                                 QWidget* parent = 0, const char* name = 0 );
 
 protected slots:
@@ -92,13 +92,13 @@ protected:
 private:
     void setPreviewPalette( const QPalette& );
     void updateColorButtons();
-    void setupBackgroundMode( Qt::BackgroundMode );
+    void setupBackgroundMode( QPalette::ColorRole );
 
     QPalette pal() const;
     void setPal( const QPalette& );
 
-    QColorGroup::ColorRole centralFromItem( int );
-    QColorGroup::ColorRole effectFromItem( int );
+    QPalette::ColorRole centralFromItem( int );
+    QPalette::ColorRole effectFromItem( int );
     QPalette editPalette;
     QPalette previewPalette;
 
--- qt-x11-opensource-src-4.5.0/tools/qtconfig/previewframe.cpp.ark 2009-03-12 13:39:39.459764305 +0100
+++ qt-x11-opensource-src-4.5.0/tools/qtconfig/previewframe.cpp 2009-03-12 13:39:56.815873592 +0100
@@ -48,8 +48,10 @@
 QT_BEGIN_NAMESPACE
 
 PreviewFrame::PreviewFrame( QWidget *parent, const char *name )
-    : QFrame( parent, name )
+    : QFrame( parent )
 {
+    setObjectName(name);
+
     setMinimumSize(200, 200);
     setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
     setLineWidth(1);
--- qt-x11-opensource-src-4.5.0/tools/qtconfig/previewwidgetbase.cpp.ark 2009-03-12 15:18:31.956754568 +0100
+++ qt-x11-opensource-src-4.5.0/tools/qtconfig/previewwidgetbase.cpp 2009-03-12 15:15:11.385888148 +0100
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
  *  name 'name' and widget flags set to 'f'.
  */
 PreviewWidgetBase::PreviewWidgetBase(QWidget* parent, const char* name, Qt::WindowFlags fl)
-    : QWidget(parent, name, fl)
+    : QWidget(parent, fl)
 {
     setupUi(this);
 
--- qt-x11-opensource-src-4.5.0/tools/qtconfig/previewwidgetbase.ui.ark 2009-03-12 13:37:34.767775325 +0100
+++ qt-x11-opensource-src-4.5.0/tools/qtconfig/previewwidgetbase.ui 2009-03-12 13:39:26.280748262 +0100
@@ -98,7 +98,7 @@
                 <number>6</number>
               </property>
               <item>
-                <widget class="Q3ButtonGroup" name="ButtonGroup1" >
+                <widget class="QGroupBox" name="ButtonGroup1" >
                   <property name="objectName" >
                     <string notr="true" >ButtonGroup1</string>
                   </property>
@@ -152,7 +152,7 @@
                 </widget>
               </item>
               <item>
-                <widget class="Q3ButtonGroup" name="ButtonGroup2" >
+                <widget class="QGroupBox" name="ButtonGroup2" >
                   <property name="objectName" >
                     <string notr="true" >ButtonGroup2</string>
                   </property>
--- qt-x11-opensource-src-4.5.0/tools/qtconfig/previewwidget.cpp.ark 2009-03-12 13:40:06.146993091 +0100
+++ qt-x11-opensource-src-4.5.0/tools/qtconfig/previewwidget.cpp 2009-03-12 13:44:21.943881038 +0100
@@ -48,11 +48,12 @@ PreviewWidget::PreviewWidget( QWidget *p
     : PreviewWidgetBase( parent, name )
 {
     // install event filter on child widgets
-    QObjectList l = queryList("QWidget");
-    for (int i = 0; i < l.size(); ++i) {
-        QObject * obj = l.at(i);
-        obj->installEventFilter(this);
-        ((QWidget*)obj)->setFocusPolicy(Qt::NoFocus);
+    foreach(QObject *o, children()) {
+ QWidget * obj=qobject_cast<QWidget*>(o);
+ if(obj) {
+            obj->installEventFilter(this);
+            ((QWidget*)obj)->setFocusPolicy(Qt::NoFocus);
+ }
     }
 }
 
--- qt-x11-opensource-src-4.5.0/tools/qtconfig/qtconfig.pro.ark 2009-03-12 13:34:10.471768508 +0100
+++ qt-x11-opensource-src-4.5.0/tools/qtconfig/qtconfig.pro 2009-03-12 13:34:14.601873918 +0100
@@ -5,7 +5,6 @@ build_all:!build_pass {
     CONFIG += release
 }
 LANGUAGE = C++
-QT += qt3support
 
 contains(QT_CONFIG, gstreamer):LIBS += $$QT_LIBS_GSTREAMER -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10
 contains(QT_CONFIG, gstreamer):QMAKE_CXXFLAGS += $$QT_CFLAGS_GSTREAMER
--- qt-x11-opensource-src-4.5.0/tools/tools.pro.ark 2009-03-12 15:19:16.558753960 +0100
+++ qt-x11-opensource-src-4.5.0/tools/tools.pro 2009-03-12 15:19:28.442759476 +0100
@@ -14,7 +14,7 @@ no-png {
      }
      SUBDIRS     += linguist
      wince*: SUBDIRS = qtestlib designer
-     unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
+     unix:!mac:!embedded:SUBDIRS += qtconfig
      win32:!wince*:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt
 }