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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkonsole/KDE/4=2E6=5D_/=3A_Build=2E?=
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2011-02-01 19:15:45
Message-ID: 20110201191545.E97F5A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit fa21e4bea2202b3ba6a03e0846fada603d1fe025 by Andreas Pakulat. on behalf of Christophe Giboudeaux
Committed on 30/01/11 at 20:32.
Pushed by apaku into branch 'KDE/4.6'.

Build.

M  +4    -0    CMakeLists.txt     
M  +1    -1    src/TerminalDisplay.cpp     

http://commits.kde.org/konsole/fa21e4bea2202b3ba6a03e0846fada603d1fe025

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 315b3e2..987cbd9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,9 @@
+project(Konsole)
+
 find_package(KDE4 4.6.40 REQUIRED)
 
+include(KDE4Defaults)
+
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
 
diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
index b559729..97d7590 100644
--- a/src/TerminalDisplay.cpp
+++ b/src/TerminalDisplay.cpp
@@ -54,7 +54,7 @@
 #include <KIO/NetAccess>
 
 // Konsole
-#include <config-apps.h>
+//#include <config-apps.h>
 #include "Filter.h"
 #include "konsole_wcwidth.h"
 #include "ScreenWindow.h"


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