Michael Vetter
549474322d
* Added object selection preview * Added toggle to select enclosed rather than touched objects (#3023) * Added Sentry crash handler to Linux AppImage (disabled by default) * Added %tileid variable for custom commands on tilesets (#3026) * Added option to lock the position of views and tool bars * Added toggle to show/hide other maps in the same world (#2859) * Added a helpful text to Terrain Sets view when it is empty (#3015) * Allow opening projects from the File menu (#3000) * Made the terrains list in the Terrain Sets view not collapsible (#3015) * Automatically select the first terrain when selecting a Terrain Set (#3015) * When duplicating objects, place the duplicates next to the originals (#2998) * Tweaked selection outlines to be a little fatter and adjust to DPI * Write --export-formats output to stdout instead of stderr (#3002) * Allow hiding objects in the Tile Collision Editor * Scripting: Added missing Tileset.transparentColor property * Fixed 'Detach templates' export option to add tilesets when needed * Fixed Terrain Brush behavior on map edges * Fixed Terrain Brush behavior for sets transitioning to nothing * Fixed loss of edit focus when hovering tileset while assigning terrain (#3015) * Fixed shortcuts for flipping or rotating the current terrain pattern * Fixed switching to Terrain Brush when clicked terrain is already selected (#3015) * Fixed state of "dynamic wrapping" toggle button on startup * Fixed parallax layer positioning when reordering layers (#3009) * Windows: Fixed Swedish translation missing from installer * Windows: Re-enabled code signing by SignPath (was missing for Tiled 1.5) * snap: Added 'removable-media' plug, for accessing USB drives * snap: "Open Containing Folder" action now also selects the file * JSON plugin: Write out "version" property as string (#3033) * YY plugin: Fixed plugin loading issue for qmake builds OBS-URL: https://build.opensuse.org/package/show/games:tools/tiled?expand=0&rev=62
48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
From 7059846dc551a5d6b3cda8c78aa990aff8a4861f Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <bjorn@lindeijer.nl>
|
|
Date: Mon, 26 Apr 2021 19:12:00 +0200
|
|
Subject: [PATCH] Fixed compilation issue with GCC 10
|
|
|
|
main.cpp:334:33: error no match for 'operator<<' (operand types are 'QTextStream' and '<unresolved overloaded function type>'
|
|
---
|
|
src/tiled/main.cpp | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/tiled/main.cpp b/src/tiled/main.cpp
|
|
index fce9f3cd2d..b9b89e2203 100644
|
|
--- a/src/tiled/main.cpp
|
|
+++ b/src/tiled/main.cpp
|
|
@@ -260,7 +260,7 @@ void CommandLineHandler::showVersion()
|
|
if (!showedVersion) {
|
|
showedVersion = true;
|
|
stdOut() << QApplication::applicationDisplayName() << " "
|
|
- << QApplication::applicationVersion() << endl;
|
|
+ << QApplication::applicationVersion() << Qt::endl;
|
|
quit = true;
|
|
}
|
|
}
|
|
@@ -317,9 +317,9 @@ void CommandLineHandler::showExportFormats()
|
|
}
|
|
formats.sort(Qt::CaseSensitive);
|
|
|
|
- stdOut() << tr("Map export formats:") << endl;
|
|
+ stdOut() << tr("Map export formats:") << Qt::endl;
|
|
for (const QString &name : formats)
|
|
- stdOut() << " " << name << endl;
|
|
+ stdOut() << " " << name << Qt::endl;
|
|
|
|
formats.clear();
|
|
const auto tilesetFormats = PluginManager::objects<TilesetFormat>();
|
|
@@ -329,9 +329,9 @@ void CommandLineHandler::showExportFormats()
|
|
}
|
|
formats.sort(Qt::CaseSensitive);
|
|
|
|
- stdOut() << tr("Tileset export formats:") << endl;
|
|
+ stdOut() << tr("Tileset export formats:") << Qt::endl;
|
|
for (const QString &name : formats)
|
|
- stdOut() << " " << name << endl;
|
|
+ stdOut() << " " << name << Qt::endl;
|
|
|
|
quit = true;
|
|
}
|