Hello community, here is the log from the commit of package qt checked in at Sat Aug 12 19:02:55 CEST 2006. -------- --- qt/qt-sql-plugins.changes 2006-07-31 16:24:58.000000000 +0200 +++ qt/qt-sql-plugins.changes 2006-08-12 00:17:03.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Aug 12 00:16:47 CEST 2006 - dmueller@suse.de + +- add patch for middle click support in QSystemTrayIcon + +------------------------------------------------------------------- +Tue Aug 1 11:57:06 CEST 2006 - dmueller@suse.de + +- add provides/obsoletes for dbus-1-qt + +------------------------------------------------------------------- qt.changes: same change New: ---- qsystemtray-middleclick.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.pGbG1b/_old 2006-08-12 19:02:30.000000000 +0200 +++ /var/tmp/diff_new_pack.pGbG1b/_new 2006-08-12 19:02:30.000000000 +0200 @@ -19,11 +19,11 @@ License: QPL, GPL Group: Development/Libraries/C and C++ Autoreqprov: on -Summary: Qt 4 SQL related libraries +Summary: Qt 4 SQL-Related Libraries # COMMON-BEGIN # COMMON-BEGIN Version: 4.1.9_20060704 -Release: 1 +Release: 2 %define x11_free -x11- %define rversion 4.2.0-snapshot-20060704 Source: qt%x11_free%rversion.tar.bz2 @@ -33,6 +33,7 @@ Source13: assistant4.desktop Patch2: qt-never-strip.diff Patch3: qt-core-plugins.diff +Patch4: qsystemtray-middleclick.diff Patch5: lib64.patch Patch9: 0130-coverity-checks.diff Patch13: fix-plugin-loading.diff @@ -40,8 +41,8 @@ %define common_options -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/qt/ -examplesdir %_docdir/qt/examples -demosdir %_docdir/qt/demos -plugindir %plugindir -translationdir /usr/share/qt/translations -sysconfdir /etc/settings -datadir /usr/share/qt/ %description -Qt 4 libraries which are used for connection with an SQL server. You -will need also a plugin package for a supported SQL server. +Qt 4 libraries that are used for connection with an SQL server. You +will need also a plug-in package for a supported SQL server. @@ -55,6 +56,7 @@ #%patch -p1 #%patch2 %patch3 +%patch4 %patch5 %patch9 %patch13 @@ -192,6 +194,10 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog -n qt-sql-plugins +* Sat Aug 12 2006 - dmueller@suse.de +- add patch for middle click support in QSystemTrayIcon +* Tue Aug 01 2006 - dmueller@suse.de +- add provides/obsoletes for dbus-1-qt * Mon Jul 31 2006 - dmueller@suse.de - Update to Qt 4.2 technical preview 1 - QGraphicsView ++++++ qt.spec ++++++ --- /var/tmp/diff_new_pack.pGbG1b/_old 2006-08-12 19:02:30.000000000 +0200 +++ /var/tmp/diff_new_pack.pGbG1b/_new 2006-08-12 19:02:30.000000000 +0200 @@ -22,7 +22,7 @@ Summary: C++ Program Library, Core Components # COMMON-BEGIN Version: 4.1.9_20060704 -Release: 1 +Release: 2 %define x11_free -x11- %define rversion 4.2.0-snapshot-20060704 Source: qt%x11_free%rversion.tar.bz2 @@ -32,6 +32,7 @@ Source13: assistant4.desktop Patch2: qt-never-strip.diff Patch3: qt-core-plugins.diff +Patch4: qsystemtray-middleclick.diff Patch5: lib64.patch Patch9: 0130-coverity-checks.diff Patch13: fix-plugin-loading.diff @@ -56,6 +57,7 @@ #%patch -p1 #%patch2 %patch3 +%patch4 %patch5 %patch9 %patch13 @@ -68,6 +70,8 @@ Requires: xorg-x11-devel zlib-devel c++_compiler pkgconfig Requires: freetype2-devel libmng-devel libpng-devel Requires: qt = %version +Provides: dbus-1-qt-devel < 0.63 +Obsoletes: dbus-1-qt-devel < 0.63 %description devel You need this package, if you want to compile programs with Qt. It @@ -84,6 +88,8 @@ %package dbus-1 Group: System/Libraries Summary: C++ Program Library, D-BUS Bindings +Provides: dbus-1-qt < 0.63 +Obsoletes: dbus-1-qt < 0.63 %description dbus-1 Qt is a set of libraries for developing applications. @@ -323,6 +329,10 @@ %_libdir/libQtSql*.so.* %changelog -n qt +* Sat Aug 12 2006 - dmueller@suse.de +- add patch for middle click support in QSystemTrayIcon +* Tue Aug 01 2006 - dmueller@suse.de +- add provides/obsoletes for dbus-1-qt * Mon Jul 31 2006 - dmueller@suse.de - Update to Qt 4.2 technical preview 1 - QGraphicsView ++++++ qsystemtray-middleclick.diff ++++++ ------------------------------------------------------------------------ r562185 | hausmann | 2006-07-14 11:03:04 +0200 (Fri, 14 Jul 2006) | 3 lines - support for middle click as activation reason, as requested by Aaron/kde-core-devel. Done with Girish. ------------------------------------------------------------------------ Index: src/gui/util/qsystemtrayicon.cpp =================================================================== --- src/gui/util/qsystemtrayicon.cpp (revision 562184) +++ src/gui/util/qsystemtrayicon.cpp (revision 562185) @@ -250,6 +250,7 @@ bool QSystemTrayIcon::event(QEvent *e) \value Context The context menu for the system tray entry was requested \value DoubleClick The system tray entry was double clicked \value Trigger The system tray entray was clicked + \value MiddleClick The system tray entray was clicked with the middle mouse button \sa activated() */ @@ -525,6 +526,9 @@ bool QBalloonTip::eventFilter(QObject *o return QWidget::eventFilter(o, e); } -void qtsystray_sendActivated(QSystemTrayIcon *i, int r) { emit i->activated(r); } +void qtsystray_sendActivated(QSystemTrayIcon *i, int r) +{ + emit i->activated((QSystemTrayIcon::ActivationReason)r); +} #endif // QT_NO_SYSTEMTRAYICON Index: src/gui/util/qsystemtrayicon.h =================================================================== --- src/gui/util/qsystemtrayicon.h (revision 562184) +++ src/gui/util/qsystemtrayicon.h (revision 562185) @@ -58,7 +58,8 @@ public: Unknown, Context, DoubleClick, - Trigger + Trigger, + MiddleClick }; void setContextMenu(QMenu *menu); @@ -84,7 +85,7 @@ public Q_SLOTS: inline void hide() { setVisible(false); } Q_SIGNALS: - void activated(int reason); + void activated(QSystemTrayIcon::ActivationReason reason); void messageClicked(); protected: Index: src/gui/util/qsystemtrayicon_x11.cpp =================================================================== --- src/gui/util/qsystemtrayicon_x11.cpp (revision 562184) +++ src/gui/util/qsystemtrayicon_x11.cpp (revision 562185) @@ -226,6 +226,8 @@ void QSystemTrayIconSys::mousePressEvent emit q->activated(QSystemTrayIcon::Trigger); else if (ev->button() == Qt::RightButton) emit q->activated(QSystemTrayIcon::Context); + else if (ev->button() == Qt::MidButton) + emit q->activated(QSystemTrayIcon::MiddleClick); } void QSystemTrayIconSys::mouseDoubleClickEvent(QMouseEvent *ev) Index: examples/desktop/systray/mainwindow.h =================================================================== --- examples/desktop/systray/mainwindow.h (revision 562184) +++ examples/desktop/systray/mainwindow.h (revision 562185) @@ -39,7 +39,7 @@ private slots: void toggleVisibility(); void showMessage(); void balloonClicked(); - void activated(int); + void activated(QSystemTrayIcon::ActivationReason); void changeIcon(int); private: Index: examples/desktop/systray/mainwindow.cpp =================================================================== --- examples/desktop/systray/mainwindow.cpp (revision 562184) +++ examples/desktop/systray/mainwindow.cpp (revision 562185) @@ -44,8 +44,8 @@ MainWindow::MainWindow(QWidget *parent) trayIcon = new QSystemTrayIcon(this); trayIcon->setToolTip("System trayIcon example"); trayIcon->setContextMenu(menu); - QObject::connect(trayIcon, SIGNAL(activated(int)), - this, SLOT(activated(int))); + QObject::connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), + this, SLOT(activated(QSystemTrayIcon::ActivationReason))); QObject::connect(trayIcon, SIGNAL(messageClicked()), this, SLOT(balloonClicked())); changeIcon(0); // set the first icon @@ -81,7 +81,7 @@ MainWindow::MainWindow(QWidget *parent) icons << "16x16 icon" << "22x22 icon" << "32x32 icon"; iconPicker->addItems(icons); QObject::connect(iconPicker, SIGNAL(activated(int)), - this, SLOT(changeIcon(int))); + this, SLOT(changeIcon(int))); QGridLayout *layout = new QGridLayout; layout->addWidget(titleLabel, 0, 0); layout->addWidget(titleEdit, 0, 1); @@ -120,7 +120,7 @@ void MainWindow::balloonClicked() info->append(tr("Balloon message was clicked")); } -void MainWindow::activated(int reason) +void MainWindow::activated(QSystemTrayIcon::ActivationReason reason) { QString r; switch (reason) { @@ -136,6 +136,9 @@ void MainWindow::activated(int reason) case QSystemTrayIcon::Trigger: r = tr("Trigger"); break; + case QSystemTrayIcon::MiddleClick: + r = tr("MiddleClick"); + break; } info->append(QString("Activated - Reason %1").arg(r)); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...