diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-11-18 11:27:03 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-11-18 11:27:03 +0100 |
| commit | a8eb882b2bdeb39f810b2d9e5dff3be5a3c330c7 (patch) | |
| tree | 0a0b35dc4661e4dc2c35e629b4f15f76e4e8b6bc /CMakeLists.txt | |
| parent | Merge commit 'refs/merge-requests/2106' of git://gitorious.org/rekonq/mainlin... (diff) | |
| parent | KIO download system (diff) | |
| download | rekonq-a8eb882b2bdeb39f810b2d9e5dff3be5a3c330c7.tar.xz | |
FIxing conflicts
Merge branch 'rekonq04' into dev04try
Conflicts:
src/CMakeLists.txt
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8454c2f6..a9e9c2b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,9 +21,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) # ================================================================================== -SET(QT_MIN_VERSION 4.5.0) +SET(QT_MIN_VERSION 4.6.0) FIND_PACKAGE(Qt4 REQUIRED) -SET(KDE_MIN_VERSION 4.3.1) +SET(KDE_MIN_VERSION 4.3.74) FIND_PACKAGE(KDE4 REQUIRED) INCLUDE(MacroOptionalFindPackage) @@ -96,7 +96,6 @@ IF(REKONQ_CAN_BE_COMPILED) ADD_SUBDIRECTORY( src ) ADD_SUBDIRECTORY( icons ) - ADD_SUBDIRECTORY( data ) ADD_SUBDIRECTORY( docs ) ENDIF(REKONQ_CAN_BE_COMPILED) |