.gitattributes

@@ -20,6 +20,3 @@
 *.PDF  diff=astextplain
 *.rtf  diff=astextplain
 *.RTF  diff=astextplain
-
-# Code in 3rdlib/ is not part of Pencil itself
-3rdlib/** linguist-vendored

.travis.yml

@@ -45,7 +45,6 @@ addons:
       - doxygen-latex
       - doxygen-gui
       - graphviz
-      - squashfs-tools
       - python3
       - python3-pip
 
@@ -97,21 +96,11 @@ after_success:
       make INSTALL_ROOT="${PWD}/Pencil2D" install;
       rm -rf Pencil2D/usr/lib;
       echo "Creating AppImage...";
+      sed -i "/^Keywords\(\[[a-zA-Z_.@]\+\]\)\?=/d;/^Version=/cVersion=1.0" Pencil2D/usr/share/applications/pencil2d.desktop;
       install -Dm755 /usr/bin/ffmpeg Pencil2D/usr/plugins/ffmpeg;
       curl -fsSLO https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage;
       chmod 755 linuxdeployqt-continuous-x86_64.AppImage;
-      ./linuxdeployqt-continuous-x86_64.AppImage --appimage-extract;
-      curl -fsSLO http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.23.tar.xz;
-      bsdtar xf desktop-file-utils-0.23.tar.xz;
-      cd desktop-file-utils-0.23;
-      ./configure;
-      make;
-      cd ../;
-      cp desktop-file-utils-0.23/src/desktop-file-validate squashfs-root/usr/bin/desktop-file-validate;
-      curl -fsSLO https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage;
-      chmod a+x appimagetool-x86_64.AppImage;
-      ./appimagetool-x86_64.AppImage squashfs-root linuxdeployqt-fixed.AppImage;
-      LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu/pulseaudio" ./linuxdeployqt-fixed.AppImage Pencil2D/usr/share/applications/pencil2d.desktop -executable=Pencil2D/usr/plugins/ffmpeg -appimage;
+      LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu/pulseaudio" ./linuxdeployqt-continuous-x86_64.AppImage Pencil2D/usr/share/applications/pencil2d.desktop -executable=Pencil2D/usr/plugins/ffmpeg -appimage;
       mv "Pencil2D-x86_64.AppImage" "pencil2d-linux-$(date +"%Y-%m-%d").AppImage";
      fi'
   - 'if [ "$TRAVIS_OS_NAME" == "osx" ]; then
@@ -120,7 +109,7 @@ after_success:
       mv bin Pencil2D;
       echo "Fixing info.plist";
       cd Pencil2D;
-      plutil -replace CFBundleExecutable -string Pencil2D Pencil2D.app/Contents/Info.plist;
+      plutil -replace CFBundleExecutable -string pencil2d Pencil2D.app/Contents/Info.plist;
       plutil -replace CFBundleIdentifier -string org.pencil2d.Pencil2D Pencil2D.app/Contents/Info.plist;
 
       echo "Copying ffmpeg plugin";
@@ -159,5 +148,8 @@ after_success:
   # Deploy doxygen documentation to github pages
   - 'if [ "$TRAVIS_BRANCH" == "master" -a "$TRAVIS_OS_NAME" == "linux" ]; then
       cd "$TRAVIS_BUILD_DIR/util";
+      for i in core svg xmlpatterns; do
+        curl -fsSLO "https://doc.qt.io/qt-5/qt$i.tags";
+      done;
       ./documentation-deploy.sh;
     fi'

Doxyfile

@@ -2118,7 +2118,17 @@ SKIP_FUNCTION_MACROS   = YES
 # the path). If a tag file is not located in the directory in which doxygen is
 # run, you must also specify the path to the tagfile here.
 
-TAGFILES               =
+TAGFILES               = util/qtcore.tags=https://doc.qt.io/qt-5/ \
+                         util/qtsvg.tags=https://doc.qt.io/qt-5/ \
+                         util/qtxmlpatterns.tags=https://doc.qt.io/qt-5/ \
+                         /usr/share/qt5/doc/qtcore/qtcore.tags=/usr/share/qt5/doc/qtcore/ \
+                         /usr/share/qt5/doc/qtsvg/qtsvg.tags=/usr/share/qt5/doc/qtsvg/ \
+                         /usr/share/qt5/doc/qtxmlpatterns/qtxmlpatterns.tags=/usr/share/qt5/doc/qtxmlpatterns/ \
+                         /usr/share/doc/qt/qtcore/qtcore.tags=/usr/share/doc/qt/qtcore/ \
+                         /usr/share/doc/qt/qtsvg/qtsvg.tags=/usr/share/doc/qt/qtsvg/ \
+                         /usr/share/doc/qt/qtxmlpatterns/qtxmlpatterns.tags=/usr/share/doc/qt/qtxmlpatterns/
+                         # Currently Qt Multimedia isn't configured to generate a tagfile, see
+                         # https://github.com/qt/qtmultimedia/blob/5.9/src/multimedia/doc/qtmultimedia.qdocconf
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create a
 # tag file that is based on the input files it reads. See section "Linking to

README.md

@@ -6,13 +6,13 @@
 
 ### Pencil2D 0.6  (1 December 2017)
 
-[What's new?](https://pencil2d.github.io/2017/12/introducing-pencil2d-0.6.html)
+[What's new?](https://www.pencil2d.org/2017/12/introducing-pencil2d-0.6.html)
 
 | Windows 64 bit   | Windows 32 bit    | Mac             | Linux             |
 | :--------------: | :---------------: | :-------------: | :---------------: |
 | [Download][0]    | [Download][1]     | [Download][2]   | [Download][3]     |
 
-[0]: https://github.com/pencil2d/pencil/releases/download/0.6.0/pencil2d-win64-0.6.0.zip
+[0]: https://github.com/pencil2d/pencil/releases/download/0.6.0/pencil2d-win64-0.6.0-ffmpeg341.zip
 [1]: https://github.com/pencil2d/pencil/releases/download/0.6.0/pencil2d-win32-0.6.0.zip
 [2]: https://github.com/pencil2d/pencil/releases/download/0.6.0/pencil2d-mac-0.6.0.zip
 [3]: https://github.com/pencil2d/pencil/releases/download/0.6.0/pencil2d-linux-amd64-0.6.0.AppImage
@@ -45,7 +45,7 @@ The link will direct you to Google Drive, please right-click a file and select D
 
 ## Links
 
-* Pencil2D Official Website: [http://pencil2d.github.io/](http://pencil2d.github.io/)
+* Pencil2D Official Website: <https://www.pencil2d.org/>
 * Report a bug or Request features in [Issue tracker](https://github.com/pencil2d/pencil/issues)
 * You can help translate Pencil2D on [transifex](https://www.transifex.com/pencil2d/)!
 * [Developer Guide](https://github.com/pencil2d/pencil/wiki)