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

List:       kde-commits
Subject:    extragear/utils/yakuake
From:       Eike Hein <hein () kde ! org>
Date:       2009-04-06 20:00:06
Message-ID: 1239048006.783047.11170.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 950307 by hein:

Now that I know which KDE 4.3 pre-release version number
contains my Konsole KPart changes (4.2.68), and that 4.3
will indeed depend on Qt 4.5, simplify all these checks.


 M  +2 -2      ChangeLog  
 M  +3 -4      app/CMakeLists.txt  
 M  +1 -1      app/application.cpp  
 M  +1 -1      app/application.h  
 M  +3 -3      app/main.cpp  
 M  +4 -4      app/mainwindow.cpp  


--- trunk/extragear/utils/yakuake/ChangeLog #950306:950307
@@ -44,8 +44,8 @@
   the default Yakuake window width of 90% work area width.
 * Rewrote fullscreen handling, fixing bugs such as exiting fullscreen mode
   on virtual desktop switch.
-* Rewrote the translucency support not to use X11-specific code on Qt 4.5
-  or higher and KDE 4.3 or higher.
+* Rewrote the translucency support not to use X11-specific code on KDE 4.3 or
+  higher.
 * Fixed a regression from the background painting changes in 2.9.4 that
   caused splitter handles between terminals to appear in the user-confi-
   gured background color.
--- trunk/extragear/utils/yakuake/app/CMakeLists.txt #950306:950307
@@ -33,12 +33,11 @@
 
 target_link_libraries(yakuake ${KDE4_KPARTS_LIBS})
 
-macro_ensure_version("4.5.0" ${QTVERSION} QT_IS_45_OR_HIGHER)
-macro_ensure_version("4.3.0" ${KDE_VERSION} KDE_IS_43_OR_HIGHER)
+macro_ensure_version("4.2.68" ${KDE_VERSION} KDE_IS_43_OR_HIGHER)
 
-if(Q_WS_X11 AND !QT_IS_45_OR_HIGHER AND !KDE_IS_43_OR_HIGHER)
+if(Q_WS_X11 AND !KDE_IS_43_OR_HIGHER)
   target_link_libraries(yakuake ${X11_Xrender_LIB} ${X11_X11_LIB})
-endif(Q_WS_X11 AND !QT_IS_45_OR_HIGHER AND !KDE_IS_43_OR_HIGHER)
+endif(Q_WS_X11 AND !KDE_IS_43_OR_HIGHER)
 
 install(TARGETS yakuake ${INSTALL_TARGETS_DEFAULT_ARGS})
 
--- trunk/extragear/utils/yakuake/app/application.cpp #950306:950307
@@ -28,7 +28,7 @@
     init();
 }
 
-#if defined(Q_WS_X11) && QT_VERSION < 0x040500 || !KDE_IS_VERSION(4,3,0)
+#if defined(Q_WS_X11) && !KDE_IS_VERSION(4,2,68)
 Application::Application(Display* display, Qt::HANDLE visual, Qt::HANDLE colormap)
     : KUniqueApplication(display, visual, colormap)
 {
--- trunk/extragear/utils/yakuake/app/application.h #950306:950307
@@ -34,7 +34,7 @@
 
     public:
         explicit Application();
-#if defined(Q_WS_X11) && QT_VERSION < 0x040500 || !KDE_IS_VERSION(4,3,0)
+#if defined(Q_WS_X11) && !KDE_IS_VERSION(4,2,68)
         explicit Application(Display* display, Qt::HANDLE visual, Qt::HANDLE \
colormap);  #endif
         virtual ~Application();
--- trunk/extragear/utils/yakuake/app/main.cpp #950306:950307
@@ -28,7 +28,7 @@
 
 #include <QString>
 
-#if defined(Q_WS_X11) && QT_VERSION < 0x040500 || !KDE_IS_VERSION(4,3,0)
+#if defined(Q_WS_X11) && !KDE_IS_VERSION(4,2,68)
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrender.h>
 
@@ -68,7 +68,7 @@
         exit(0);
     }
 
-#if defined(Q_WS_X11) && QT_VERSION < 0x040500 || !KDE_IS_VERSION(4,3,0)
+#if defined(Q_WS_X11) && !KDE_IS_VERSION(4,2,68)
     if (KWindowSystem::compositingActive()) 
     {
             Display* display = 0;
@@ -91,7 +91,7 @@
 }
 
 // Code from the Qt 4 graphics dojo examples at http://labs.trolltech.com
-#if defined(Q_WS_X11) && QT_VERSION < 0x040500 || !KDE_IS_VERSION(4,3,0)
+#if defined(Q_WS_X11) && !KDE_IS_VERSION(4,2,68)
 void getDisplayInformation(Display*& display, Visual*& visual, Colormap& colormap)
 {
     display = XOpenDisplay(0);
--- trunk/extragear/utils/yakuake/app/mainwindow.cpp #950306:950307
@@ -47,7 +47,7 @@
 #include <QtDBus/QtDBus>
 #include <QTimer>
 
-#if defined(Q_WS_X11) && QT_VERSION < 0x040500 || !KDE_IS_VERSION(4,3,0)
+#if defined(Q_WS_X11) && !KDE_IS_VERSION(4,2,68)
 #include <QX11Info>
 
 #include <X11/Xlib.h>
@@ -60,7 +60,7 @@
 {
     QDBusConnection::sessionBus().registerObject("/yakuake/window", this, \
QDBusConnection::ExportScriptableSlots);  
-#if QT_VERSION >= 0x040500 && KDE_IS_VERSION(4,3,0)
+#if KDE_IS_VERSION(4,2,68)
     setAttribute(Qt::WA_TranslucentBackground, true);
 #endif
 
@@ -989,7 +989,7 @@
 
 void MainWindow::updateUseTranslucency()
 {
-#if defined(Q_WS_X11) && QT_VERSION < 0x040500 || !KDE_IS_VERSION(4,3,0)
+#if defined(Q_WS_X11) && !KDE_IS_VERSION(4,2,68)
     bool ARGB = false;
 
     int screen = QX11Info::appScreen();
@@ -1010,7 +1010,7 @@
         m_useTranslucency = KWindowSystem::compositingActive();
     }
     else
-#elif QT_VERSION >= 0x040500 && KDE_IS_VERSION(4,3,0)
+#elif KDE_IS_VERSION(4,2,68)
     if (Settings::translucency())
     {
         m_useTranslucency = KWindowSystem::compositingActive();


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