diff options
Diffstat (limited to 'examples/embedded/flightinfo')
-rw-r--r-- | examples/embedded/flightinfo/.prev_CMakeLists.txt | 47 | ||||
-rw-r--r-- | examples/embedded/flightinfo/CMakeLists.txt | 21 | ||||
-rw-r--r-- | examples/embedded/flightinfo/flightinfo.cpp | 2 |
3 files changed, 67 insertions, 3 deletions
diff --git a/examples/embedded/flightinfo/.prev_CMakeLists.txt b/examples/embedded/flightinfo/.prev_CMakeLists.txt new file mode 100644 index 0000000000..f7898e8ed8 --- /dev/null +++ b/examples/embedded/flightinfo/.prev_CMakeLists.txt @@ -0,0 +1,47 @@ +# Generated from flightinfo.pro. + +cmake_minimum_required(VERSION 3.14) +project(flightinfo LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples/embedded/flightinfo") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Network) +find_package(Qt6 COMPONENTS Widgets) + +add_qt_gui_executable(flightinfo + flightinfo.cpp + form.ui +) +target_link_libraries(flightinfo PUBLIC + Qt::Core + Qt::Gui + Qt::Network + Qt::Widgets +) + + +# Resources: +set(flightinfo_resource_files + "aircraft.png" +) + +qt6_add_resources(flightinfo "flightinfo" + PREFIX + "/" + FILES + ${flightinfo_resource_files} +) + +install(TARGETS flightinfo + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/embedded/flightinfo/CMakeLists.txt b/examples/embedded/flightinfo/CMakeLists.txt index b2d7695c37..f7898e8ed8 100644 --- a/examples/embedded/flightinfo/CMakeLists.txt +++ b/examples/embedded/flightinfo/CMakeLists.txt @@ -9,20 +9,37 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/embedded/flightinfo") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Network) find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(flightinfo flightinfo.cpp form.ui - flightinfo.qrc # special case: add ) target_link_libraries(flightinfo PUBLIC + Qt::Core + Qt::Gui Qt::Network Qt::Widgets ) + + +# Resources: +set(flightinfo_resource_files + "aircraft.png" +) + +qt6_add_resources(flightinfo "flightinfo" + PREFIX + "/" + FILES + ${flightinfo_resource_files} +) + install(TARGETS flightinfo RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/embedded/flightinfo/flightinfo.cpp b/examples/embedded/flightinfo/flightinfo.cpp index f46fc9693f..732e07583a 100644 --- a/examples/embedded/flightinfo/flightinfo.cpp +++ b/examples/embedded/flightinfo/flightinfo.cpp @@ -144,7 +144,7 @@ public: private slots: void handleNetworkData(QNetworkReply *networkReply) { - if (!networkReply->error()) { + if (!networkReply->networkError()) { if (!mapReplies.contains(networkReply)) { // Assume UTF-8 encoded QByteArray data = networkReply->readAll(); |