Projekt

Allgemein

Profil

Qt » arena.diff

Maximilian Seesslen, 19.11.2024 19:36

Unterschiede anzeigen:

CMakeLists.txt
20 20
if ( "${MCU_PLATFORM}" MATCHES "linux" )
21 21

  
22 22
   # Check either Qt6 or Qt5
23
   find_package( QT NAMES Qt5 Qt6 COMPONENTS Core REQUIRED )
24
   find_package( Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core )
23
   find_package( QT NAMES Qt5 Qt6 COMPONENTS Core Widgets REQUIRED )
24
   find_package( Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets )
25 25

  
26 26
endif()
27 27

  
......
79 79
   target_link_libraries( arena
80 80
            biwak
81 81
            lepto
82
            # Qt${QT_VERSION_MAJOR}::Widgets
83
            # Qt${QT_VERSION_MAJOR}::Gui
82 84
   )
83 85
endif()
84 86

  
arena/frameworks/qt.json
777 777
            {
778 778
               "type": "consumes",
779 779
               "value": "direct"
780
            },
781
            {
782
               "type": "fixed",
783
               "value": "\"name\""
780 784
            }
781 785
         ]
782 786
      },
include/arena/platform_base.hpp
14 14

  
15 15
//---Includes-----------------------------------------------------------------
16 16

  
17
//#include <lepto/debug.h>
18
//#include <lepto/serial2can.h>
19
//#include <lepto/ansiparser.h>
20
//#include <biwak/rtc.hpp>
21
//#include <biwak/biwak.h>            // lrtimer_t
22
//#include <arena/config.h>
17

  
18
#if BIWAK_PLATFORM == foo
19
#error "Unknown platform: please set BIWAK_PLATFORM"
20
#elif BIWAK_PLATFORM == stm32
21
//#include <stm32/platform_base.hpp>
22
#elif BIWAK_PLATFORM == linux
23
//#include <linux/platform_base.hpp>
24
// #include <QMainWindow>
25
#else
26
#error "Unknown platform: BIWAK_PLATFORM"
27
#endif
28

  
23 29

  
24 30
//---Defines------------------------------------------------------------------
25 31

  
......
29 35

  
30 36

  
31 37
class CPlatformBase
38
      #if BIWAK_PLATFORM == linux
39
         // :public QMainWindow
40
      #endif
32 41
{
33 42
   private:
34 43
      CPlatformBase(const CPlatformBase& that) = delete;
pinmuxer/src/writerPlatform.cpp
292 292
         {
293 293
              arguments+=value;
294 294
         }
295
         if ( type == "label" )
296
         {
297
            if( value == "name" )
298
            {
299
              arguments+=;
300
            }
301
         }
295 302
         else if ( type == "consumes" )
296 303
         {
297 304
              arguments+=getConsumingArguments( periphery, value == "indirect" );
(4-4/6)