[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/ksplash/ksplashx
From:       Benjamin Reed <ranger () befunk ! com>
Date:       2010-03-05 18:07:24
Message-ID: 1267812444.049140.3937.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1099516 by reed:

merge 1099515 from 4.4: these apply to Q_WS_MAC, not Q_OS_MAC (Q_WS_X11 on OSX uses \
the same ordering as on other platforms)

 M  +1 -1      qpoint.h  
 M  +1 -1      qrect.h  


--- trunk/KDE/kdebase/workspace/ksplash/ksplashx/qpoint.h #1099515:1099516
@@ -93,7 +93,7 @@
 private:
     static void warningDivByZero();
 
-#if defined(Q_OS_MAC)
+#if defined(Q_WS_MAC)
     QCOORD yp;
     QCOORD xp;
 #else
--- trunk/KDE/kdebase/workspace/ksplash/ksplashx/qrect.h #1099515:1099516
@@ -145,7 +145,7 @@
 #if defined(Q_WS_X11) || defined(Q_OS_TEMP)
     friend void qt_setCoords( QRect *r, int xp1, int yp1, int xp2, int yp2 );
 #endif
-#if defined(Q_OS_MAC)
+#if defined(Q_WS_MAC)
     QCOORD y1;
     QCOORD x1;
     QCOORD y2;


[prev in list] [next in list] [prev in thread] [next in thread]