rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into dsmx_stuff

Browse Source
This commit is contained in:
sambas 2011-08-07 09:51:41 +03:00
commit 1d99d8a0d6
26 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ground/openpilotgcs/openpilotgcs.pri
View File

@ -19,6 +19,19 @@ defineReplace(addNewline) {
return($$escape_expand(\\n\\t))
}
defineReplace(qtLibraryName) {
unset(LIBRARY_NAME)
LIBRARY_NAME = $$1
CONFIG(debug, debug|release) {
!debug_and_release|build_pass {
mac:RET = $$member(LIBRARY_NAME, 0)_debug
else:win32:RET = $$member(LIBRARY_NAME, 0)d
}
}
isEmpty(RET):RET = $$LIBRARY_NAME
return($$RET)
}
# For use in custom compilers which just copy files
win32:i_flag = i
defineReplace(stripSrcDir) {

11
ground/openpilotgcs/src/app/app.pro
View File

@ -11,16 +11,15 @@ SOURCES += main.cpp
include(../rpath.pri)
include(../libs/utils/utils.pri)
win32 {
CONFIG(debug, debug|release):LIBS *= -lExtensionSystemd -lAggregationd -lQExtSerialPortd
else:LIBS *= -lExtensionSystem -lAggregation -lQExtSerialPort
LIBS *= -l$$qtLibraryName(ExtensionSystem) -l$$qtLibraryName(Aggregation)
win32 {
# CONFIG(debug, debug|release):LIBS *= -lExtensionSystemd -lAggregationd -lQExtSerialPortd
# else:LIBS *= -lExtensionSystem -lAggregation -lQExtSerialPort
RC_FILE = openpilotgcs.rc
target.path = /bin
INSTALLS += target
} else:macx {
CONFIG(debug, debug|release):LIBS *= -lExtensionSystem_debug -lAggregation_debug
else:LIBS *= -lExtensionSystem -lAggregation
LIBS += -framework CoreFoundation
ICON = openpilotgcs.icns
QMAKE_INFO_PLIST = Info.plist
@ -28,8 +27,6 @@ win32 {
FILETYPES.path = Contents/Resources
QMAKE_BUNDLE_DATA += FILETYPES
} else {
LIBS *= -lExtensionSystem -lAggregation
target.path = /bin
INSTALLS += target
}

2
ground/openpilotgcs/src/libs/aggregation/aggregation.pri
View File

@ -1 +1 @@
LIBS *= -l$$qtLibraryTarget(Aggregation)
LIBS *= -l$$qtLibraryName(Aggregation)

2
ground/openpilotgcs/src/libs/extensionsystem/extensionsystem.pri
View File

@ -1,3 +1,3 @@
include(extensionsystem_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(ExtensionSystem)
LIBS *= -l$$qtLibraryName(ExtensionSystem)

2
ground/openpilotgcs/src/libs/glc_lib/glc_lib.pri
View File

@ -1,2 +1,2 @@
QT += opengl
LIBS += -l$$qtLibraryTarget(GLC_lib)
LIBS *= -l$$qtLibraryName(GLC_lib)

2
ground/openpilotgcs/src/libs/libqxt/libqxt.pri
View File

@ -1,4 +1,4 @@
LIBS += -l$$qtLibraryTarget(QxtCore)
LIBS *= -l$$qtLibraryName(QxtCore)
INCLUDEPATH += \
$$GCS_SOURCE_TREE/src/libs/libqxt/src/core

2
ground/openpilotgcs/src/libs/opmapcontrol/opmapcontrol.pri
View File

@ -1 +1 @@
LIBS *= -l$$qtLibraryTarget(opmapwidget)
LIBS *= -l$$qtLibraryName(opmapwidget)

2
ground/openpilotgcs/src/libs/qextserialport/qextserialport.pri
View File

@ -1,2 +1,2 @@
LIBS += -l$$qtLibraryTarget(QExtSerialPort)
LIBS *= -l$$qtLibraryName(QExtSerialPort)

2
ground/openpilotgcs/src/libs/qscispinbox/qscispinbox.pri
View File

@ -1 +1 @@
LIBS *= -l$$qtLibraryTarget(QScienceSpinBox)
LIBS *= -l$$qtLibraryName(QScienceSpinBox)

2
ground/openpilotgcs/src/libs/qtconcurrent/qtconcurrent.pri
View File

@ -1 +1 @@
LIBS *= -l$$qtLibraryTarget(QtConcurrent)
LIBS *= -l$$qtLibraryName(QtConcurrent)

2
ground/openpilotgcs/src/libs/qwt/qwt.pri
View File

@ -1,2 +1,2 @@
LIBS += -l$$qtLibraryTarget(Qwt)
LIBS *= -l$$qtLibraryName(Qwt)

2
ground/openpilotgcs/src/libs/sdlgamepad/sdlgamepad.pri
View File

@ -1 +1 @@
LIBS += -l$$qtLibraryTarget(sdlgamepad)
LIBS *= -l$$qtLibraryName(sdlgamepad)

10
ground/openpilotgcs/src/libs/utils/utils.pri
View File

@ -1,9 +1 @@
macx {
CONFIG(debug, debug|release):LIBS *= -lUtils_debug
else:LIBS *= -lUtils
} else:win32 {
CONFIG(debug, debug|release):LIBS *= -lUtilsd
else:LIBS *= -lUtils
} else {
LIBS += -l$$qtLibraryTarget(Utils)
}
LIBS *= -l$$qtLibraryName(Utils)

2
ground/openpilotgcs/src/openpilotgcslibrary.pri
View File

@ -8,7 +8,7 @@ DESTDIR = $$GCS_LIBRARY_PATH
include(rpath.pri)
TARGET = $$qtLibraryTarget($$TARGET)
TARGET = $$qtLibraryName($$TARGET)
contains(QT_CONFIG, reduce_exports):CONFIG += hGCS_symbols

2
ground/openpilotgcs/src/openpilotgcsplugin.pri
View File

@ -23,7 +23,7 @@ copy2build.name = COPY ${QMAKE_FILE_IN}
copy2build.CONFIG += no_link
QMAKE_EXTRA_COMPILERS += copy2build
TARGET = $$qtLibraryTarget($$TARGET)
TARGET = $$qtLibraryName($$TARGET)
macx {
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Plugins/$${PROVIDER}/

2
ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pri
View File

@ -1,2 +1,2 @@
include(coreplugin_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(Core)
LIBS *= -l$$qtLibraryName(Core)

18
ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp
View File

@ -478,13 +478,13 @@ void DialGadgetWidget::setDialFont(QString fontProps)
// this enables smooth rotation in rotateNeedles below
void DialGadgetWidget::setNeedle1(double value) {
if (rotateN1) {
needle1Target = 360*(value*n1Factor-n1MinValue)/(n1MaxValue-n1MinValue);
needle1Target = 360*(value*n1Factor)/(n1MaxValue-n1MinValue);
}
if (horizN1) {
needle1Target = (value*n1Factor-n1MinValue)/(n1MaxValue-n1MinValue);
needle1Target = (value*n1Factor)/(n1MaxValue-n1MinValue);
}
if (vertN1) {
needle1Target = (value*n1Factor-n1MinValue)/(n1MaxValue-n1MinValue);
needle1Target = (value*n1Factor)/(n1MaxValue-n1MinValue);
}
if (!dialTimer.isActive())
dialTimer.start();
@ -497,13 +497,13 @@ void DialGadgetWidget::setNeedle1(double value) {
void DialGadgetWidget::setNeedle2(double value) {
if (rotateN2) {
needle2Target = 360*(value*n2Factor-n2MinValue)/(n2MaxValue-n2MinValue);
needle2Target = 360*(value*n2Factor)/(n2MaxValue-n2MinValue);
}
if (horizN2) {
needle2Target = (value*n2Factor-n2MinValue)/(n2MaxValue-n2MinValue);
needle2Target = (value*n2Factor)/(n2MaxValue-n2MinValue);
}
if (vertN2) {
needle2Target = (value*n2Factor-n2MinValue)/(n2MaxValue-n2MinValue);
needle2Target = (value*n2Factor)/(n2MaxValue-n2MinValue);
}
if (!dialTimer.isActive())
dialTimer.start();
@ -517,13 +517,13 @@ void DialGadgetWidget::setNeedle2(double value) {
void DialGadgetWidget::setNeedle3(double value) {
if (rotateN3) {
needle3Target = 360*(value*n3Factor-n3MinValue)/(n3MaxValue-n3MinValue);
needle3Target = 360*(value*n3Factor)/(n3MaxValue-n3MinValue);
}
if (horizN3) {
needle3Target = (value*n3Factor-n3MinValue)/(n3MaxValue-n3MinValue);
needle3Target = (value*n3Factor)/(n3MaxValue-n3MinValue);
}
if (vertN3) {
needle3Target = (value*n3Factor-n3MinValue)/(n3MaxValue-n3MinValue);
needle3Target = (value*n3Factor)/(n3MaxValue-n3MinValue);
}
if (!dialTimer.isActive())
dialTimer.start();

2
ground/openpilotgcs/src/plugins/ipconnection/ipconnection.pri
View File

@ -1,3 +1,3 @@
include(ipconnection_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(IPconnection)
LIBS *= -l$$qtLibraryName(IPconnection)

9
ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp
View File

@ -76,11 +76,10 @@ QIODevice* LoggingConnection::openDevice(const QString &deviceName)
if (logFile.isOpen()){
logFile.close();
}
QFileDialog * fd = new QFileDialog();
fd->setAcceptMode(QFileDialog::AcceptOpen);
fd->setNameFilter("OpenPilot Log (*.opl)");
connect(fd, SIGNAL(fileSelected(QString)), this, SLOT(startReplay(QString)));
fd->exec();
QString fileName = QFileDialog::getOpenFileName(NULL, tr("Open file"), QString(""), tr("OpenPilot Log (*.opl)"));
if (!fileName.isNull()) {
startReplay(fileName);
}
return &logFile;
}

2
ground/openpilotgcs/src/plugins/rawhid/rawhid.pri
View File

@ -1,3 +1,3 @@
include(rawhid_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(RawHID)
LIBS *= -l$$qtLibraryName(RawHID)

2
ground/openpilotgcs/src/plugins/scope/scope.pri
View File

@ -1,3 +1,3 @@
include(scope_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(ScopeGadget)
LIBS *= -l$$qtLibraryName(ScopeGadget)

2
ground/openpilotgcs/src/plugins/serialconnection/serial.pri
View File

@ -1,3 +1,3 @@
include(serial_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(Serial)
LIBS *= -l$$qtLibraryName(Serial)

2
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pri
View File

@ -3,4 +3,4 @@ include(uavobjects_dependencies.pri)
# Add the include path to the built-in uavobject include files.
INCLUDEPATH += $$PWD
LIBS *= -l$$qtLibraryTarget(UAVObjects)
LIBS *= -l$$qtLibraryName(UAVObjects)

2
ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutil.pri
View File

@ -3,4 +3,4 @@ include(uavobjectutil_dependencies.pri)
# Add the include path to the built-in uavobject include files.
INCLUDEPATH += $$PWD
LIBS *= -l$$qtLibraryTarget(UAVObjectUtil)
LIBS *= -l$$qtLibraryName(UAVObjectUtil)

2
ground/openpilotgcs/src/plugins/uavtalk/uavtalk.pri
View File

@ -1,3 +1,3 @@
include(uavtalk_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(UAVTalk)
LIBS *= -l$$qtLibraryName(UAVTalk)

2
ground/openpilotgcs/src/plugins/welcome/welcome.pri
View File

@ -1,3 +1,3 @@
include(welcome_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(Welcome)
LIBS *= -l$$qtLibraryName(Welcome)