浏览代码

Merge branch 'jeely_xingyueL' of http://111.33.136.149:3000/adc_pilot/modularization into jeely_xingyueL

lijinliang 2 年之前
父节点
当前提交
bcdf9026cc
共有 2 个文件被更改,包括 3 次插入1 次删除
  1. 1 1
      src/tool/carControlTester/mainwindow.cpp
  2. 2 0
      src/tool/carControlTester/mainwindow.h

+ 1 - 1
src/tool/carControlTester/mainwindow.cpp

@@ -1,7 +1,7 @@
 #include "mainwindow.h"
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "ui_mainwindow.h"
 
 
-
+export CarControl car_control_module;
 MainWindow::MainWindow(QWidget *parent) :
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     QMainWindow(parent),
     ui(new Ui::MainWindow)
     ui(new Ui::MainWindow)

+ 2 - 0
src/tool/carControlTester/mainwindow.h

@@ -6,6 +6,8 @@
 #include <QDebug>
 #include <QDebug>
 #include "include/car_control.h"
 #include "include/car_control.h"
 
 
+CarControl car_control_module;
+
 namespace Ui {
 namespace Ui {
 class MainWindow;
 class MainWindow;
 }
 }