Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-17 13:24:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2403 from csoler/v0.6-BugFixing_10

Browse Source 
fixing VOIP compilaiton on ubuntu 20.04
This commit is contained in:
csoler 2021-04-04 14:44:49 +02:00 committed by GitHub
commit 12e556c204
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/VOIP/VOIP.pro
View File

@ -53,7 +53,7 @@ linux-* {
PKGCONFIG += libavcodec libavutil
PKGCONFIG += speex speexdsp
PKGCONFIG += opencv
PKGCONFIG += opencv4
} else {
LIBS += -lspeex -lspeexdsp -lavcodec -lavutil
}

8
retroshare-gui/src/gui/NewsFeed.cpp
View File

@ -83,7 +83,10 @@ NewsFeed::NewsFeed(QWidget *parent) : MainPage(parent), ui(new Ui::NewsFeed),
RsEventType::MAIL_STATUS
})
{
for(uint32_t i=0;i<mEventTypes.size();++i)
/* Invoke the Qt Designer generated object setup routine */
ui->setupUi(this);
for(uint32_t i=0;i<mEventTypes.size();++i)
{
mEventHandlerIds.push_back(0); // needed to force intialization by registerEventsHandler()
rsEvents->registerEventsHandler(
@ -91,9 +94,6 @@ NewsFeed::NewsFeed(QWidget *parent) : MainPage(parent), ui(new Ui::NewsFeed),
mEventHandlerIds.back(), mEventTypes[i] );
}
/* Invoke the Qt Designer generated object setup routine */
ui->setupUi(this);
if (!instance) {
instance = this;
}