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

List:       kde-commits
Subject:    playground/base/marble
From:       Torsten Rahn <tackat () kde ! org>
Date:       2007-05-07 14:36:05
Message-ID: 1178548565.227203.26848.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 662133 by rahn:

- Make KMarble compile again (KMainWindow -> KXmlGuiWindow)
- Default to QTONLY = OFF



 M  +1 -1      CMakeLists.txt  
 M  +1 -1      src/KdeMainWindow.cpp  
 M  +2 -2      src/KdeMainWindow.h  


--- trunk/playground/base/marble/CMakeLists.txt #662132:662133
@@ -1,6 +1,6 @@
 project(marble)
 
-option(QTONLY  "Build Qt only" ON)
+option(QTONLY  "Build Qt only" OFF)
 option(STATIC_BUILD "Link to static Qt libs (win32 only)" OFF)
 if(STATIC_BUILD)
     add_definitions(-DSTATIC_BUILD=1)
--- trunk/playground/base/marble/src/KdeMainWindow.cpp #662132:662133
@@ -7,7 +7,7 @@
 #include <KStandardAction>
 #include <KStatusBar>
  
-MainWindow::MainWindow(QWidget *parent) : KMainWindow(parent)
+MainWindow::MainWindow(QWidget *parent) : KXmlGuiWindow(parent)
 {
     m_katlascontrol = new KAtlasControl(0);
     setCentralWidget(m_katlascontrol);
--- trunk/playground/base/marble/src/KdeMainWindow.h #662132:662133
@@ -1,10 +1,10 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
  
-#include <KMainWindow>
+#include <KXmlGuiWindow>
 #include "katlascontrol.h"
  
-class MainWindow : public KMainWindow
+class MainWindow : public KXmlGuiWindow
 {
     public:
         MainWindow(QWidget *parent=0);
[prev in list] [next in list] [prev in thread] [next in thread]