diff options
| author | ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com> | 2022-11-15 10:05:04 +0200 |
|---|---|---|
| committer | ADudeCalledLeo <7997354+Leo40Git@users.noreply.github.com> | 2022-11-15 10:05:04 +0200 |
| commit | ba46ff6692beb49c32260a962894c53996c32ccf (patch) | |
| tree | 4df8660508f0e93587f9d0fb221bed960f0d7b31 /launcher/meta | |
| parent | cca052ccc9d644c84384ceefe97bbce45381a9e2 (diff) | |
| parent | cedc7754d96e4c53d50bcce2b2a0f139b840f3d0 (diff) | |
| download | PrismLauncher-ba46ff6692beb49c32260a962894c53996c32ccf.tar.gz PrismLauncher-ba46ff6692beb49c32260a962894c53996c32ccf.tar.bz2 PrismLauncher-ba46ff6692beb49c32260a962894c53996c32ccf.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/instance-shortcuts
Diffstat (limited to 'launcher/meta')
| -rw-r--r-- | launcher/meta/Index.cpp | 4 | ||||
| -rw-r--r-- | launcher/meta/JsonFormat.h | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/launcher/meta/Index.cpp b/launcher/meta/Index.cpp index eec1b329..242aad9f 100644 --- a/launcher/meta/Index.cpp +++ b/launcher/meta/Index.cpp @@ -58,11 +58,11 @@ QVariant Index::data(const QModelIndex &index, int role) const } int Index::rowCount(const QModelIndex &parent) const { - return m_lists.size(); + return parent.isValid() ? 0 : m_lists.size(); } int Index::columnCount(const QModelIndex &parent) const { - return 1; + return parent.isValid() ? 0 : 1; } QVariant Index::headerData(int section, Qt::Orientation orientation, int role) const { diff --git a/launcher/meta/JsonFormat.h b/launcher/meta/JsonFormat.h index 93217b7e..63128a4e 100644 --- a/launcher/meta/JsonFormat.h +++ b/launcher/meta/JsonFormat.h @@ -60,11 +60,6 @@ struct Require QString suggests; }; -inline Q_DECL_PURE_FUNCTION uint qHash(const Require &key, uint seed = 0) Q_DECL_NOTHROW -{ - return qHash(key.uid, seed); -} - using RequireSet = std::set<Require>; void parseIndex(const QJsonObject &obj, Index *ptr); |