[Traverso-commit] traverso/src base.pri traverso/songcanvas/Clips...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/06/04 08:37:59

Modified files:
        src            : base.pri 
        src/traverso/songcanvas: ClipsViewPort.cpp 

Log message:
        workaround for qt 4.3.0 scrollbar problem.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/base.pri?cvsroot=traverso&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/ClipsViewPort.cpp?cvsroot=traverso&r1=1.20&r2=1.21

Patches:
Index: base.pri
===================================================================
RCS file: /sources/traverso/traverso/src/base.pri,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- base.pri    8 May 2007 16:44:31 -0000       1.32
+++ base.pri    4 Jun 2007 08:37:58 -0000       1.33
@@ -9,8 +9,8 @@
 # Choose debug or release build
 #
 
-#CONFIG += debug
-CONFIG += release
+CONFIG += debug
+#CONFIG += release
 
 #
 # Add support for Jack / ALSA audio driver. If you have a 
@@ -19,14 +19,16 @@
 
 DEFINES += JACK_SUPPORT
 DEFINES += ALSA_SUPPORT
-#DEFINES += PORTAUDIO_SUPPORT
+DEFINES += PORTAUDIO_SUPPORT
 DEFINES += LV2_SUPPORT
 
-DEFINES += STATIC_BUILD
+#DEFINES += STATIC_BUILD
 #DEFINES += USE_MEM_CHECKER
 
+DEFINES += QT_430_SCROLLBAR_FIX
+
 !macx{
-       #DEFINES += PRECOMPILED_HEADER
+       DEFINES += PRECOMPILED_HEADER
 }
 
 #QMAKE_CXXFLAGS +=  -fstack-protector-all

Index: traverso/songcanvas/ClipsViewPort.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/ClipsViewPort.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- traverso/songcanvas/ClipsViewPort.cpp       30 May 2007 13:14:48 -0000      
1.20
+++ traverso/songcanvas/ClipsViewPort.cpp       4 Jun 2007 08:37:59 -0000       
1.21
@@ -46,8 +46,13 @@
        viewport()->setAttribute(Qt::WA_OpaquePaintEvent);
        
 //     setViewportUpdateMode(SmartViewportUpdate);
+#if QT_VERSION == 0x040300 && (! QT_430_SCROLLBAR_FIX)
+       horizontalScrollBar()->setMaximumHeight(0);
+       verticalScrollBar()->setMaximumHeight(0);
+#else 
        setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
        setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+#endif 
 }
 
 void ClipsViewPort::get_pointed_context_items(QList<ContextItem* > &list)