[uim-commit] r579 - trunk/qt

[kzk at freedesktop.org]

Author: kzk
Date: 2005-02-06 13:22:21 -0800 (Sun, 06 Feb 2005)
New Revision: 579

Modified:
   trunk/qt/Makefile.am
   trunk/qt/toolbar-standalone-qt.cpp
Log:
* qt/Makefile.am
  - add -avoid-version to LDFLAGS.
    Thanks UTUMI-san!
* qt/toolbar-standalone-qt.cpp 
  - use PE_DockWindowSeparator for toolbar like KToolbar


Modified: trunk/qt/Makefile.am
===================================================================
--- trunk/qt/Makefile.am	2005-02-06 19:33:48 UTC (rev 578)
+++ trunk/qt/Makefile.am	2005-02-06 21:22:21 UTC (rev 579)
@@ -78,7 +78,7 @@
 	immodule-quiminputcontext.cpp immodule-quiminputcontext_with_slave.cpp \
 	immodule-subwindow.cpp
 libquiminputcontextplugin_la_CXXFLAGS = $(QT_CXXFLAGS)
-libquiminputcontextplugin_la_LDFLAGS  = $(QT_LDFLAGS)
+libquiminputcontextplugin_la_LDFLAGS  = $(QT_LDFLAGS) -avoid-version
 libquiminputcontextplugin_la_LIBADD   = $(top_builddir)/uim/libuim.la
 
 immodule-candidatewindow.cpp: immodule-candidatewindow.moc
@@ -102,7 +102,7 @@
 noinst_LTLIBRARIES = libtoolbarcommon.la
 libtoolbarcommon_la_SOURCES  = toolbar-common-quimhelpertoolbar.cpp toolbar-common-uimstateindicator.cpp
 libtoolbarcommon_la_CXXFLAGS = $(QT_CXXFLAGS)
-libtoolbarcommon_la_LDFLAGS  = $(QT_LDFLAGS)
+libtoolbarcommon_la_LDFLAGS  = $(QT_LDFLAGS) -avoid-version
 libtoolbarcommon_la_LIBADD   = $(top_builddir)/uim/libuim.la
 toolbar-common-quimhelpertoolbar.cpp: toolbar-common-quimhelpertoolbar.moc
 toolbar-common-uimstateindicator.cpp: toolbar-common-uimstateindicator.moc

Modified: trunk/qt/toolbar-standalone-qt.cpp
===================================================================
--- trunk/qt/toolbar-standalone-qt.cpp	2005-02-06 19:33:48 UTC (rev 578)
+++ trunk/qt/toolbar-standalone-qt.cpp	2005-02-06 21:22:21 UTC (rev 579)
@@ -97,7 +97,7 @@
 void UimToolbarDraggingHandler::drawContents( QPainter* p )
 {
     const QStyle::SFlags flags = QStyle::Style_Default | QStyle::Style_Horizontal;
-    style().drawPrimitive( QStyle::PE_Splitter, p,
+    style().drawPrimitive( QStyle::PE_DockWindowSeparator, p,
                            contentsRect(), colorGroup(), flags );
 }