Compile fixes on linux

This commit is contained in:
baldurk
2017-08-24 19:15:28 +01:00
parent 9fabf709ff
commit 2a0fac1ad6
7 changed files with 11 additions and 5 deletions
-1
View File
@@ -24,7 +24,6 @@
#include "RDStyle.h"
#include <QAbstractItemView>
#include <QBitmap>
#include <QComboBox>
#include <QCommonStyle>
#include <QDebug>
+1
View File
@@ -25,6 +25,7 @@
#pragma once
#include <QAbstractAnimation>
#include <QBitmap>
#include <QPalette>
#include <QProxyStyle>
#include "Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.h"
@@ -26,6 +26,7 @@
#include <QApplication>
#include <QClipboard>
#include <QDropEvent>
#include "Code/Interface/QRDInterface.h"
RDTableWidget::RDTableWidget(QWidget *parent) : QTableWidget(parent)
{
@@ -35,11 +35,11 @@
#define JSON_ID "rdocPerformanceCounterSettings"
#define JSON_VER 1
// specialise this template so we can use QSet<GPUCounter>
template <>
inline uint qHash(const GPUCounter &t, uint seed)
// we can't specialise the template, but creating an overload works. This lets us use
// QSet<GPUCounter>
inline uint qHash(const GPUCounter &t)
{
return qHash(uint32_t(t), seed);
return qHash(uint32_t(t));
}
namespace
@@ -64,6 +64,8 @@ struct SortValue
val.u = result.value.u64;
else
val.u = result.value.u32;
default: break;
}
}
};
+1
View File
@@ -23,6 +23,7 @@
******************************************************************************/
#include "core/plugins.h"
#include "os/os_specific.h"
#include "serialise/string_utils.h"
std::string LocatePluginFile(const std::string &path, const std::string &fileName)
+2
View File
@@ -22,4 +22,6 @@
* THE SOFTWARE.
******************************************************************************/
#include <string>
std::string LocatePluginFile(const std::string &path, const std::string &fileName);