diff -Nru tiled-daily-0+git20170322~20~ubuntu16.04.1/debian/bzr-builder.manifest tiled-daily-0+git20170323~20~ubuntu16.04.1/debian/bzr-builder.manifest --- tiled-daily-0+git20170322~20~ubuntu16.04.1/debian/bzr-builder.manifest 2017-03-22 13:46:39.000000000 +0000 +++ tiled-daily-0+git20170323~20~ubuntu16.04.1/debian/bzr-builder.manifest 2017-03-23 13:47:04.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version 0+git20170322~20 -lp:tiled revid:git-v1:1629be0f84cc8f5c778f1fb0e138dd7b4b795751 +# bzr-builder format 0.3 deb-version 0+git20170323~20 +lp:tiled revid:git-v1:aff4900dc8a36b96a4f41f48e158cd57179ea26b merge packaging lp:~mapeditor.org/+junk/packaging revid:bjorn@lindeijer.nl-20160601220745-2nrijn3cex733sx4 diff -Nru tiled-daily-0+git20170322~20~ubuntu16.04.1/debian/changelog tiled-daily-0+git20170323~20~ubuntu16.04.1/debian/changelog --- tiled-daily-0+git20170322~20~ubuntu16.04.1/debian/changelog 2017-03-22 13:46:39.000000000 +0000 +++ tiled-daily-0+git20170323~20~ubuntu16.04.1/debian/changelog 2017-03-23 13:47:04.000000000 +0000 @@ -1,6 +1,6 @@ -tiled-daily (0+git20170322~20~ubuntu16.04.1) xenial; urgency=low +tiled-daily (0+git20170323~20~ubuntu16.04.1) xenial; urgency=low * Auto build. - -- Launchpad Package Builder Wed, 22 Mar 2017 13:46:39 +0000 + -- Launchpad Package Builder Thu, 23 Mar 2017 13:47:04 +0000 diff -Nru tiled-daily-0+git20170322~20~ubuntu16.04.1/.pc/.quilt_patches tiled-daily-0+git20170323~20~ubuntu16.04.1/.pc/.quilt_patches --- tiled-daily-0+git20170322~20~ubuntu16.04.1/.pc/.quilt_patches 2017-03-22 13:46:39.000000000 +0000 +++ tiled-daily-0+git20170323~20~ubuntu16.04.1/.pc/.quilt_patches 2017-03-23 13:47:04.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-1338689/chroot-autobuild/home/buildd/work/tree/tiled-daily-0+git20170322~20~ubuntu16.04.1/debian/patches +/home/buildd/build-RECIPEBRANCHBUILD-1339384/chroot-autobuild/home/buildd/work/tree/tiled-daily-0+git20170323~20~ubuntu16.04.1/debian/patches diff -Nru tiled-daily-0+git20170322~20~ubuntu16.04.1/.pc/.quilt_series tiled-daily-0+git20170323~20~ubuntu16.04.1/.pc/.quilt_series --- tiled-daily-0+git20170322~20~ubuntu16.04.1/.pc/.quilt_series 2017-03-22 13:46:39.000000000 +0000 +++ tiled-daily-0+git20170323~20~ubuntu16.04.1/.pc/.quilt_series 2017-03-23 13:47:04.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-1338689/chroot-autobuild/home/buildd/work/tree/tiled-daily-0+git20170322~20~ubuntu16.04.1/debian/patches/series +/home/buildd/build-RECIPEBRANCHBUILD-1339384/chroot-autobuild/home/buildd/work/tree/tiled-daily-0+git20170323~20~ubuntu16.04.1/debian/patches/series diff -Nru tiled-daily-0+git20170322~20~ubuntu16.04.1/README.md tiled-daily-0+git20170323~20~ubuntu16.04.1/README.md --- tiled-daily-0+git20170322~20~ubuntu16.04.1/README.md 2017-03-22 13:46:36.000000000 +0000 +++ tiled-daily-0+git20170323~20~ubuntu16.04.1/README.md 2017-03-23 13:46:59.000000000 +0000 @@ -16,7 +16,6 @@ [![Build status](https://ci.appveyor.com/api/projects/status/ceb79jn5cf99y3qd/branch/master?svg=true)](https://ci.appveyor.com/project/bjorn/tiled/branch/master) [![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=52019)](https://www.bountysource.com/trackers/52019-tiled?utm_source=52019&utm_medium=shield&utm_campaign=TRACKER_BADGE) [![Translation status](https://hosted.weblate.org/widgets/tiled/-/shields-badge.svg)](https://hosted.weblate.org/engage/tiled/?utm_source=widget) -[![LiveCoding.tv](http://codiad-billauger.rhcloud.com/badges/?style=online-status-v1&channel=bjorn&offline=Follow to get notified)](https://www.livecoding.tv/bjorn/) About the Qt Version ------------------------------------------------------------------------------- diff -Nru tiled-daily-0+git20170322~20~ubuntu16.04.1/src/libtiled/libtiled.pro tiled-daily-0+git20170323~20~ubuntu16.04.1/src/libtiled/libtiled.pro --- tiled-daily-0+git20170322~20~ubuntu16.04.1/src/libtiled/libtiled.pro 2017-03-22 13:46:36.000000000 +0000 +++ tiled-daily-0+git20170323~20~ubuntu16.04.1/src/libtiled/libtiled.pro 2017-03-23 13:46:59.000000000 +0000 @@ -27,70 +27,7 @@ contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols -SOURCES += compression.cpp \ - filesystemwatcher.cpp \ - gidmapper.cpp \ - grouplayer.cpp \ - hexagonalrenderer.cpp \ - imagelayer.cpp \ - imagereference.cpp \ - isometricrenderer.cpp \ - layer.cpp \ - map.cpp \ - mapobject.cpp \ - mapreader.cpp \ - maprenderer.cpp \ - maptovariantconverter.cpp \ - mapwriter.cpp \ - objectgroup.cpp \ - orthogonalrenderer.cpp \ - plugin.cpp \ - pluginmanager.cpp \ - properties.cpp \ - savefile.cpp \ - staggeredrenderer.cpp \ - tile.cpp \ - tileanimationdriver.cpp \ - tilelayer.cpp \ - tileset.cpp \ - tilesetformat.cpp \ - tilesetmanager.cpp \ - varianttomapconverter.cpp -HEADERS += compression.h \ - filesystemwatcher.h \ - gidmapper.h \ - grouplayer.h \ - hexagonalrenderer.h \ - imagelayer.h \ - imagereference.h \ - isometricrenderer.h \ - layer.h \ - logginginterface.h \ - map.h \ - mapformat.h \ - mapobject.h \ - mapreader.h \ - maprenderer.h \ - maptovariantconverter.h \ - mapwriter.h \ - object.h \ - objectgroup.h \ - orthogonalrenderer.h \ - plugin.h \ - pluginmanager.h \ - properties.h \ - savefile.h \ - staggeredrenderer.h \ - terrain.h \ - tile.h \ - tileanimationdriver.h \ - tiled.h \ - tiled_global.h \ - tilelayer.h \ - tileset.h \ - tilesetformat.h \ - tilesetmanager.h \ - varianttomapconverter.h +include(./libtiled-src.pri) contains(INSTALL_HEADERS, yes) { headers.files = $${HEADERS} diff -Nru tiled-daily-0+git20170322~20~ubuntu16.04.1/src/libtiled/libtiled-src.pri tiled-daily-0+git20170323~20~ubuntu16.04.1/src/libtiled/libtiled-src.pri --- tiled-daily-0+git20170322~20~ubuntu16.04.1/src/libtiled/libtiled-src.pri 1970-01-01 00:00:00.000000000 +0000 +++ tiled-daily-0+git20170323~20~ubuntu16.04.1/src/libtiled/libtiled-src.pri 2017-03-23 13:46:59.000000000 +0000 @@ -0,0 +1,66 @@ +INCLUDEPATH += $$PWD + +SOURCES += $$PWD/compression.cpp \ + $$PWD/filesystemwatcher.cpp \ + $$PWD/gidmapper.cpp \ + $$PWD/grouplayer.cpp \ + $$PWD/hexagonalrenderer.cpp \ + $$PWD/imagelayer.cpp \ + $$PWD/imagereference.cpp \ + $$PWD/isometricrenderer.cpp \ + $$PWD/layer.cpp \ + $$PWD/map.cpp \ + $$PWD/mapobject.cpp \ + $$PWD/mapreader.cpp \ + $$PWD/maprenderer.cpp \ + $$PWD/maptovariantconverter.cpp \ + $$PWD/mapwriter.cpp \ + $$PWD/objectgroup.cpp \ + $$PWD/orthogonalrenderer.cpp \ + $$PWD/plugin.cpp \ + $$PWD/pluginmanager.cpp \ + $$PWD/properties.cpp \ + $$PWD/savefile.cpp \ + $$PWD/staggeredrenderer.cpp \ + $$PWD/tile.cpp \ + $$PWD/tileanimationdriver.cpp \ + $$PWD/tilelayer.cpp \ + $$PWD/tileset.cpp \ + $$PWD/tilesetformat.cpp \ + $$PWD/tilesetmanager.cpp \ + $$PWD/varianttomapconverter.cpp +HEADERS += $$PWD/compression.h \ + $$PWD/filesystemwatcher.h \ + $$PWD/gidmapper.h \ + $$PWD/grouplayer.h \ + $$PWD/hexagonalrenderer.h \ + $$PWD/imagelayer.h \ + $$PWD/imagereference.h \ + $$PWD/isometricrenderer.h \ + $$PWD/layer.h \ + $$PWD/logginginterface.h \ + $$PWD/map.h \ + $$PWD/mapformat.h \ + $$PWD/mapobject.h \ + $$PWD/mapreader.h \ + $$PWD/maprenderer.h \ + $$PWD/maptovariantconverter.h \ + $$PWD/mapwriter.h \ + $$PWD/object.h \ + $$PWD/objectgroup.h \ + $$PWD/orthogonalrenderer.h \ + $$PWD/plugin.h \ + $$PWD/pluginmanager.h \ + $$PWD/properties.h \ + $$PWD/savefile.h \ + $$PWD/staggeredrenderer.h \ + $$PWD/terrain.h \ + $$PWD/tile.h \ + $$PWD/tileanimationdriver.h \ + $$PWD/tiled.h \ + $$PWD/tiled_global.h \ + $$PWD/tilelayer.h \ + $$PWD/tileset.h \ + $$PWD/tilesetformat.h \ + $$PWD/tilesetmanager.h \ + $$PWD/varianttomapconverter.h diff -Nru tiled-daily-0+git20170322~20~ubuntu16.04.1/src/libtiled/libtiled-static.pri tiled-daily-0+git20170323~20~ubuntu16.04.1/src/libtiled/libtiled-static.pri --- tiled-daily-0+git20170322~20~ubuntu16.04.1/src/libtiled/libtiled-static.pri 1970-01-01 00:00:00.000000000 +0000 +++ tiled-daily-0+git20170323~20~ubuntu16.04.1/src/libtiled/libtiled-static.pri 2017-03-23 13:46:59.000000000 +0000 @@ -0,0 +1,3 @@ +include(./libtiled-src.pri) + +DEFINES += TILED_LIBRARY diff -Nru tiled-daily-0+git20170322~20~ubuntu16.04.1/src/tiled/objectselectionitem.cpp tiled-daily-0+git20170323~20~ubuntu16.04.1/src/tiled/objectselectionitem.cpp --- tiled-daily-0+git20170322~20~ubuntu16.04.1/src/tiled/objectselectionitem.cpp 2017-03-22 13:46:36.000000000 +0000 +++ tiled-daily-0+git20170323~20~ubuntu16.04.1/src/tiled/objectselectionitem.cpp 2017-03-23 13:46:59.000000000 +0000 @@ -153,8 +153,8 @@ MapObject *mObject; // Marching ants effect - int mUpdateTimer = startTimer(250); - int offset = 0; + int mUpdateTimer = startTimer(100); + int mOffset = 0; }; void MapObjectOutline::syncWithMapObject(MapRenderer *renderer) @@ -199,20 +199,20 @@ // Draw a black dashed line above above the white line pen.setColor(Qt::black); pen.setStyle(Qt::DashLine); - pen.setDashOffset(offset); + pen.setDashOffset(mOffset); painter->setPen(pen); painter->drawLines(lines, 4); - - // Update offset used in drawing black dashed line - offset++; } void MapObjectOutline::timerEvent(QTimerEvent *event) { - if (event->timerId() == mUpdateTimer) + if (event->timerId() == mUpdateTimer) { + // Update offset used in drawing black dashed line + mOffset++; update(); - else + } else { QGraphicsObject::timerEvent(event); + } }