Blob Blame History Raw
diff --git a/src/plugins/dotplot/src/DotPlotFilterDialog.cpp b/src/plugins/dotplot/src/DotPlotFilterDialog.cpp
index 521d76338..9e0569a3e 100644
--- a/src/plugins/dotplot/src/DotPlotFilterDialog.cpp
+++ b/src/plugins/dotplot/src/DotPlotFilterDialog.cpp
@@ -20,6 +20,7 @@
  */
 
 #include <QMessageBox>
+#include <QButtonGroup>
 
 #include <U2Core/AnnotationSettings.h>
 #include <U2Core/AnnotationTableObject.h>
diff --git a/src/ugeneui/src/project_support/DocumentProviderSelectorController.h b/src/ugeneui/src/project_support/DocumentProviderSelectorController.h
index fc06833c7..c8330f069 100644
--- a/src/ugeneui/src/project_support/DocumentProviderSelectorController.h
+++ b/src/ugeneui/src/project_support/DocumentProviderSelectorController.h
@@ -22,6 +22,8 @@
 #ifndef _U2_DOCUMENT_PROVIDER_SELECTOR_CONTROLLER_H_
 #define _U2_DOCUMENT_PROVIDER_SELECTOR_CONTROLLER_H_
 
+#include <QButtonGroup>
+
 #include <U2Core/DocumentUtils.h>
 
 #include "ui_DocumentProviderSelectorDialog.h"
diff --git a/src/ugeneui/src/project_support/DocumentProviderSelectorController.cpp b/src/ugeneui/src/project_support/DocumentProviderSelectorController.cpp
index e93c8d32a..6aede08e4 100644
--- a/src/ugeneui/src/project_support/DocumentProviderSelectorController.cpp
+++ b/src/ugeneui/src/project_support/DocumentProviderSelectorController.cpp
@@ -23,6 +23,7 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
+#include <QButtonGroup>
 #include <QToolButton>
 
 #include <U2Core/AppContext.h>
diff --git a/src/ugeneui/src/main_window/AboutDialogController.cpp b/src/ugeneui/src/main_window/AboutDialogController.cpp
index da3dc5d73..e2aa5a853 100644
--- a/src/ugeneui/src/main_window/AboutDialogController.cpp
+++ b/src/ugeneui/src/main_window/AboutDialogController.cpp
@@ -27,6 +27,7 @@
 #include <U2Core/Settings.h>
 
 #include <QPainter>
+#include <QAction>
 #include <QBrush>
 #include <QStyle>
 #include <QHBoxLayout>
@@ -47,7 +48,7 @@ AboutDialogController::AboutDialogController(QAction* visitWebAction, QWidget *p
     frame->setLayout(l);
     tWidget = NULL;
     installAWidget();
-    connect(web_page_button, SIGNAL(clicked()), visitWebAction,  SLOT(trigger()));
+    connect(web_page_button, SIGNAL(clicked(bool)), visitWebAction,  SLOT(trigger()));
     
 #ifdef Q_OS_WIN
     setWindowFlags(windowFlags() | Qt::MSWindowsFixedSizeDialogHint);
diff --git a/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.cpp b/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.cpp
index 0200ac7f4..62479a6d9 100644
--- a/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.cpp
+++ b/src/corelibs/U2Gui/src/util/ProjectTreeItemSelectorDialog.cpp
@@ -24,6 +24,7 @@
 #include <QSpacerItem>
 #include <QTreeView>
 #include <QVBoxLayout>
+#include <QAction>
 
 #include <U2Core/DocumentModel.h>
 #include <U2Core/U2SafePoints.h>
diff --git a/src/corelibs/U2Core/U2Core.pri b/src/corelibs/U2Core/U2Core.pri
index 7db5fdece..f7ea61510 100644
--- a/src/corelibs/U2Core/U2Core.pri
+++ b/src/corelibs/U2Core/U2Core.pri
@@ -50,15 +50,3 @@ unix {
     target.path = $$UGENE_INSTALL_DIR/$$UGENE_RELATIVE_DESTDIR
     INSTALLS += target
 }
-
-unix_not_mac(){
-    exists( /usr/lib/libproc.so* ) {
-      LIBS += -lproc
-    }else{
-        exists( /usr/local/lib/libproc.so* ){
-          LIBS += -lproc
-        }else{
-          LIBS += -lprocps
-        }
-    }
-}
diff --git a/src/corelibs/U2Core/src/globals/AppResources.cpp b/src/corelibs/U2Core/src/globals/AppResources.cpp
index 8c8159aaa..bc130c68a 100644
--- a/src/corelibs/U2Core/src/globals/AppResources.cpp
+++ b/src/corelibs/U2Core/src/globals/AppResources.cpp
@@ -35,7 +35,6 @@
 #include <unistd.h> //for sysconf(3)
 #endif
 #if defined(Q_OS_LINUX)
-#include <proc/readproc.h>
 #include <fstream>
 #endif
 
diff --git a/src/plugins/perf_monitor/src/PerfMonitorView.cpp b/src/plugins/perf_monitor/src/PerfMonitorView.cpp
index 26f4ea2ce..3bad7b693 100644
--- a/src/plugins/perf_monitor/src/PerfMonitorView.cpp
+++ b/src/plugins/perf_monitor/src/PerfMonitorView.cpp
@@ -28,7 +28,7 @@
 
 #ifdef Q_OS_LINUX
 #include <stdio.h>
-#include <proc/readproc.h>
+#include <sys/sysinfo.h>
 #endif
 
 #ifdef Q_OS_WIN32
@@ -64,10 +64,10 @@ PerfMonitorView::PerfMonitorView() : MWMDIWindow(tr("Application counters")){
     updateCounter.totalCount = 0;
 
 #ifdef Q_OS_LINUX
-    struct proc_t usage;
-    look_up_our_self(&usage);
-    virtMemoryCounter.totalCount = usage.vsize;
-    rssMemoryCounter.totalCount = usage.rss;
+    struct sysinfo usage;
+    sysinfo(&usage);
+    virtMemoryCounter.totalCount = usage.totalram;
+    rssMemoryCounter.totalCount = 0; // not supported
 #endif
 #ifdef Q_OS_WIN32
     PROCESS_MEMORY_COUNTERS memCounter;
@@ -83,10 +83,10 @@ PerfMonitorView::PerfMonitorView() : MWMDIWindow(tr("Application counters")){
 void PerfMonitorView::timerEvent(QTimerEvent *) {
     TimeCounter c(&updateCounter);
 #ifdef Q_OS_LINUX
-    struct proc_t usage;
-    look_up_our_self(&usage);
-    virtMemoryCounter.totalCount = usage.vsize;
-    rssMemoryCounter.totalCount = usage.rss;
+    struct sysinfo usage;
+    sysinfo(&usage);
+    virtMemoryCounter.totalCount = usage.totalram;
+    rssMemoryCounter.totalCount = 0; // not supported
 #endif
 #ifdef Q_OS_WIN32
     PROCESS_MEMORY_COUNTERS memCounter;