Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dropped workarounds for mingw49 #4144

Merged
merged 1 commit into from
Jan 15, 2025
Merged

Dropped workarounds for mingw49 #4144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/libtiled/properties.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ class TILEDSHARED_EXPORT PropertyValue
Q_PROPERTY(QString typeName READ typeName)

public:
// needed to work around compilation issue with mingw49
PropertyValue(const QVariant &value = QVariant(), int typeId = 0)
: value(value)
, typeId(typeId)
{}

QVariant value;
int typeId;

Expand Down
3 changes: 1 addition & 2 deletions src/plugins/yy/yyplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1219,8 +1219,7 @@ static std::unique_ptr<GMRLayer> processImageLayer(const ImageLayer *imageLayer,
gmrBackgroundLayer->animationSpeedType = optionalProperty(imageLayer, "animationSpeedType", gmrBackgroundLayer->animationSpeedType);
gmrBackgroundLayer->userdefinedAnimFPS = imageLayer->resolvedProperty(QStringLiteral("animationFPS")).isValid();

// Workaround compilation issue with mingw49
return std::unique_ptr<GMRLayer>(std::move(gmrBackgroundLayer));
return gmrBackgroundLayer;
}

static void processLayers(std::vector<std::unique_ptr<GMRLayer>> &gmrLayers,
Expand Down
4 changes: 2 additions & 2 deletions tests/properties/test_properties.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,8 @@ void test_Properties::enumWith31Flags()
QVariant property1 = flagsAsString.toPropertyValue(QStringLiteral("1"), context);
QVariant propertyAll = flagsAsString.toPropertyValue(allFlagsString, context);

QCOMPARE(property1, QVariant::fromValue(PropertyValue(1, flagsAsString.id)));
QCOMPARE(propertyAll, QVariant::fromValue(PropertyValue(allFlagsInt, flagsAsString.id)));
QCOMPARE(property1, QVariant::fromValue(PropertyValue { 1, flagsAsString.id }));
QCOMPARE(propertyAll, QVariant::fromValue(PropertyValue { allFlagsInt, flagsAsString.id }));

ExportValue exportString1 = flagsAsString.toExportValue(property1.value<PropertyValue>().value, context);
ExportValue exportStringAll = flagsAsString.toExportValue(propertyAll.value<PropertyValue>().value, context);
Expand Down
Loading