diff options
| author |  Alexey Sokolov | 2016-01-31 21:06:42 +0000 |
|---|---|---|
| committer | Alexey Sokolov | 2016-01-31 21:42:46 +0000 |
| commit | 5e1808caa45a705a06b7dec58222876a9078fc28 (patch) | |
| tree | d1913778e22c5fa15b4ee699d268d5c71f0f174f /src/modules | |
| parent | run codespell to fix some typos, run mkabouttext.pl, fix typos reported by Ar... (diff) | |
| download | KVIrc-5e1808caa45a705a06b7dec58222876a9078fc28.tar.gz KVIrc-5e1808caa45a705a06b7dec58222876a9078fc28.tar.bz2 KVIrc-5e1808caa45a705a06b7dec58222876a9078fc28.zip | |
Drop support of Qt4 from CMakeLists
All C++ #ifdefs are still there... See #1650
Also switch Travis to Qt5
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/objects/CMakeLists.txt | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/modules/objects/CMakeLists.txt b/src/modules/objects/CMakeLists.txt index 5e361415a..ee62632e1 100644 --- a/src/modules/objects/CMakeLists.txt +++ b/src/modules/objects/CMakeLists.txt @@ -54,20 +54,18 @@ set( KvsObject_xmlreader.cpp ) -if(CMAKE_RESULT_USING_QT5) - # Qt >= 5.0.0 has no QHttp/QFtp implementation. We use the external code provided by digia. - set( - kviobjects_SRCS - ${kviobjects_SRCS} - qthttp/qhttp.cpp - qthttp/qhttpauthenticator.cpp - qtftp/qftp.cpp - qtftp/qurlinfo.cpp - ) +# Qt >= 5.0.0 has no QHttp/QFtp implementation. We use the external code provided by digia. +set( + kviobjects_SRCS + ${kviobjects_SRCS} + qthttp/qhttp.cpp + qthttp/qhttpauthenticator.cpp + qtftp/qftp.cpp + qtftp/qurlinfo.cpp +) - include_directories(qthttp/) - include_directories(qtftp/) -endif() +include_directories(qthttp/) +include_directories(qtftp/) set(kvi_module_name kviobjects) |