1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-05 08:21:16 -05:00

Merge branch 'dev' of /shared/development/sdrangel into dev

This commit is contained in:
f4exb 2016-05-25 02:43:01 +02:00
commit 6b81701f27
7 changed files with 11 additions and 6 deletions

View File

@ -7,7 +7,7 @@
TEMPLATE = lib TEMPLATE = lib
CONFIG += plugin CONFIG += plugin
QT += core gui widgets multimedia QT += core gui widgets multimedia opengl
TARGET = inputairspy TARGET = inputairspy

View File

@ -7,7 +7,7 @@
TEMPLATE = lib TEMPLATE = lib
CONFIG += plugin CONFIG += plugin
QT += core gui widgets multimedia QT += core gui widgets multimedia opengl
TARGET = inputbladerf TARGET = inputbladerf

View File

@ -7,7 +7,7 @@
TEMPLATE = lib TEMPLATE = lib
CONFIG += plugin CONFIG += plugin
QT += core gui widgets multimedia QT += core gui widgets multimedia opengl
TARGET = inputfilesource TARGET = inputfilesource
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD

View File

@ -7,7 +7,7 @@
TEMPLATE = lib TEMPLATE = lib
CONFIG += plugin CONFIG += plugin
QT += core gui widgets multimedia QT += core gui widgets multimedia opengl
TARGET = inputhackrf TARGET = inputhackrf

View File

@ -7,7 +7,7 @@
TEMPLATE = lib TEMPLATE = lib
CONFIG += plugin CONFIG += plugin
QT += core gui widgets multimedia QT += core gui widgets multimedia opengl
TARGET = inputrtlsdr TARGET = inputrtlsdr

View File

@ -7,7 +7,7 @@
TEMPLATE = lib TEMPLATE = lib
CONFIG += plugin CONFIG += plugin
QT += core gui widgets multimedia network QT += core gui widgets multimedia network opengl
TARGET = inputsdrdaemon TARGET = inputsdrdaemon

View File

@ -30,6 +30,7 @@ SOURCES += mainwindow.cpp\
audio/audiodeviceinfo.cpp\ audio/audiodeviceinfo.cpp\
audio/audiofifo.cpp\ audio/audiofifo.cpp\
audio/audiooutput.cpp\ audio/audiooutput.cpp\
device/deviceapi.cpp\
dsp/afsquelch.cpp\ dsp/afsquelch.cpp\
dsp/agc.cpp\ dsp/agc.cpp\
dsp/channelizer.cpp\ dsp/channelizer.cpp\
@ -77,6 +78,7 @@ SOURCES += mainwindow.cpp\
gui/audiodialog.cpp\ gui/audiodialog.cpp\
gui/presetitem.cpp\ gui/presetitem.cpp\
gui/rollupwidget.cpp\ gui/rollupwidget.cpp\
gui/samplingdevicecontrol.cpp\
gui/scale.cpp\ gui/scale.cpp\
gui/scaleengine.cpp\ gui/scaleengine.cpp\
gui/valuedial.cpp\ gui/valuedial.cpp\
@ -100,6 +102,7 @@ HEADERS += mainwindow.h\
audio/audiodeviceinfo.h\ audio/audiodeviceinfo.h\
audio/audiofifo.h\ audio/audiofifo.h\
audio/audiooutput.h\ audio/audiooutput.h\
device/deviceapi.h\
dsp/afsquelch.h\ dsp/afsquelch.h\
dsp/channelizer.h\ dsp/channelizer.h\
dsp/channelmarker.h\ dsp/channelmarker.h\
@ -153,6 +156,7 @@ HEADERS += mainwindow.h\
gui/pluginsdialog.h\ gui/pluginsdialog.h\
gui/presetitem.h\ gui/presetitem.h\
gui/rollupwidget.h\ gui/rollupwidget.h\
gui/samplingdevicecontrol.h\
gui/scale.h\ gui/scale.h\
gui/scaleengine.h\ gui/scaleengine.h\
gui/valuedial.h\ gui/valuedial.h\
@ -182,6 +186,7 @@ FORMS += mainwindow.ui\
gui/glscopegui.ui\ gui/glscopegui.ui\
gui/aboutdialog.ui\ gui/aboutdialog.ui\
gui/pluginsdialog.ui\ gui/pluginsdialog.ui\
gui/samplingdevicecontrol.ui\
gui/glspectrumgui.ui\ gui/glspectrumgui.ui\
mainwindow.ui mainwindow.ui