Skip to content

Commit 2a0fac1

Browse files
committed
Compile fixes on linux
1 parent 9fabf70 commit 2a0fac1

File tree

7 files changed

+11
-5
lines changed

7 files changed

+11
-5
lines changed

qrenderdoc/Styles/RDStyle/RDStyle.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
#include "RDStyle.h"
2626
#include <QAbstractItemView>
27-
#include <QBitmap>
2827
#include <QComboBox>
2928
#include <QCommonStyle>
3029
#include <QDebug>

qrenderdoc/Styles/RDStyle/RDStyle.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#pragma once
2626

2727
#include <QAbstractAnimation>
28+
#include <QBitmap>
2829
#include <QPalette>
2930
#include <QProxyStyle>
3031
#include "Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.h"

qrenderdoc/Widgets/Extended/RDTableWidget.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <QApplication>
2727
#include <QClipboard>
2828
#include <QDropEvent>
29+
#include "Code/Interface/QRDInterface.h"
2930

3031
RDTableWidget::RDTableWidget(QWidget *parent) : QTableWidget(parent)
3132
{

qrenderdoc/Windows/Dialogs/PerformanceCounterSelection.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
#define JSON_ID "rdocPerformanceCounterSettings"
3636
#define JSON_VER 1
3737

38-
// specialise this template so we can use QSet<GPUCounter>
39-
template <>
40-
inline uint qHash(const GPUCounter &t, uint seed)
38+
// we can't specialise the template, but creating an overload works. This lets us use
39+
// QSet<GPUCounter>
40+
inline uint qHash(const GPUCounter &t)
4141
{
42-
return qHash(uint32_t(t), seed);
42+
return qHash(uint32_t(t));
4343
}
4444

4545
namespace

qrenderdoc/Windows/PerformanceCounterViewer.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ struct SortValue
6464
val.u = result.value.u64;
6565
else
6666
val.u = result.value.u32;
67+
68+
default: break;
6769
}
6870
}
6971
};

renderdoc/core/plugins.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
******************************************************************************/
2424

2525
#include "core/plugins.h"
26+
#include "os/os_specific.h"
2627
#include "serialise/string_utils.h"
2728

2829
std::string LocatePluginFile(const std::string &path, const std::string &fileName)

renderdoc/core/plugins.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@
2222
* THE SOFTWARE.
2323
******************************************************************************/
2424

25+
#include <string>
26+
2527
std::string LocatePluginFile(const std::string &path, const std::string &fileName);

0 commit comments

Comments
 (0)