diff options
| author | Lassi Lehikoinen <lassi.lehikoinen@qt.io> | 2021-01-20 08:39:59 +0200 |
|---|---|---|
| committer | Dan Ackers <dan.ackers@qt.io> | 2021-05-28 10:31:35 +0300 |
| commit | 72bd22db9f72c4d93774c79cae0760bdc39ce0de (patch) | |
| tree | f22d4c27be9ec9e3227c551d7652b3476be1d63d /libqdb | |
| parent | 1ff0ec46770254328e5ec492cbce1364936eda72 (diff) | |
Build QDB with CMake
Also some Qt6 related changes.
Task-number: QTBUG-86118
Change-Id: Id5bdf646071fcc10415945dfae73b2c66e53f7a7
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'libqdb')
| -rw-r--r-- | libqdb/CMakeLists.txt | 32 | ||||
| -rw-r--r-- | libqdb/libqdb.pro | 33 | ||||
| -rw-r--r-- | libqdb/protocol/services.h | 1 |
3 files changed, 33 insertions, 33 deletions
diff --git a/libqdb/CMakeLists.txt b/libqdb/CMakeLists.txt new file mode 100644 index 0000000..7454a2c --- /dev/null +++ b/libqdb/CMakeLists.txt @@ -0,0 +1,32 @@ +qt_internal_add_cmake_library(libqdb + INSTALL_DIRECTORY "$$[QT_INSTALL_LIBS]" + STATIC + SOURCES + abstractconnection.cpp abstractconnection.h + interruptsignalhandler.h + protocol/protocol.h + protocol/qdbmessage.cpp protocol/qdbmessage.h + protocol/qdbtransport.cpp protocol/qdbtransport.h + protocol/services.h + stream.cpp stream.h + streampacket.cpp streampacket.h + INCLUDE_DIRECTORIES + .. + PUBLIC_LIBRARIES + Qt::Core +) + +qt_extend_target(libqdb CONDITION WIN32 + SOURCES + interruptsignalhandler_win.cpp +) + +qt_extend_target(libqdb CONDITION WIN64 + SOURCES + interruptsignalhandler_win.cpp +) + +qt_extend_target(libqdb CONDITION UNIX + SOURCES + interruptsignalhandler_unix.cpp +) diff --git a/libqdb/libqdb.pro b/libqdb/libqdb.pro deleted file mode 100644 index 042a621..0000000 --- a/libqdb/libqdb.pro +++ /dev/null @@ -1,33 +0,0 @@ -QT -= gui - -TARGET = qdb -TEMPLATE = lib -CONFIG += staticlib - -SOURCES += \ - abstractconnection.cpp \ - protocol/qdbmessage.cpp \ - protocol/qdbtransport.cpp \ - stream.cpp \ - streampacket.cpp \ - -win32 { - SOURCES += interruptsignalhandler_win.cpp -} else { - SOURCES += interruptsignalhandler_unix.cpp -} - -HEADERS += \ - abstractconnection.h \ - interruptsignalhandler.h \ - protocol/protocol.h \ - protocol/qdbmessage.h \ - protocol/qdbtransport.h \ - protocol/services.h \ - stream.h \ - streampacket.h \ - -target.path = $$[QT_INSTALL_LIBS] -INSTALLS += target - -INCLUDEPATH += $$PWD/.. diff --git a/libqdb/protocol/services.h b/libqdb/protocol/services.h index 525a8bb..f34ffd9 100644 --- a/libqdb/protocol/services.h +++ b/libqdb/protocol/services.h @@ -31,6 +31,7 @@ #include <QtCore/qbytearray.h> #include <QtCore/qdatastream.h> +#include <QtCore/qiodevice.h> #include <cstdint> |