Cherry-picked new upstream release 2.0.0.

* Added current signing key * Bumped compat to 10 * Bumped debhelper to (>= 10) * Added build dependency libqt5svg5-dev * Renamed package libqt5xdg1 -> libqt5xdg2 (soname bump) * Added packages libqt5xdgiconloader2 and libqt5xdgiconloader-dev * XdgIconLoader: Recommend gtk-update-icon-cache Thanks Rohan Garg <rohan@kde.org> * Renamed install and symbols files * Fixed symbols * Fixed .gitignore * Reworked descriptions in debian/control to prevent lintian whining * Fixed copyright for xdgiconloader * Added README.md to debian/docs * Set CMAKE_BUILD_TYPE=RelWithDebInfo
8 years ago · 3c96bc717b
parent dd32e345e7
commit 3c96bc717b
65 changed files with 2178 additions and 1042 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,8 @@
 build*
 *.qm
 *~
 *.autosave
 *-swp
 *.swp
 CMakeLists.txt.user*
 nbproject/
--- a/7
+++ b/7
@ -4,7 +4,8 @@ Upstream Authors:
 Copyright:
    Copyright (c) 2010-2012 Razor team
-    Copyright (c) 2012-2014 LXQt team
+    Copyright (c) 2012-2016 LXQt team
-License: GPL-2 and LGPL-2.1+
+License: LGPL-2.1+ and LGPL-2.1-or-3-with-Digia-1.1-exception
-The full text of the licenses can be found in the 'COPYING' file.
+The full text of the LGPL-2.1+ license can be found in the 'COPYING' file.
 The Digia-1.1 exception can be found in the 'Digia-Qt-LGPL-Exception-1.1' file.
--- a/361
+++ b/361
@ -0,0 +1,361 @@
 libqtxdg-2.0.0 / 2016-09-17
 ===========================
  * Bump version to 2.0.0
  * Extend README.md
  * Updates dependencies
  * Fixes QIcon::hasThemeIcon() behavior with our Icon Loader Engine
  * Adds Qt5Svg explicitly to the required packages
  * QIconLoader: Use the GTK+ icon caches
  * QIcon: add a hook in the engine so a non null QIconEngine can still be a null icon
  * QIconLoader: don't make QIconDirInfo::type a bit-field
  * Do not support static QIcon instances
  * Respect manual set icon themes.
  * Remove <qhash.h> where it's not used
  * Make it more obvious that Q_WS_ is dead code, and should perhaps be ported
  * XdgDesktopFileData: Explicitly initialize members (#91)
  * build: Create separate Qt5XdgIconLoader target
  * XdgDesktopFile: Adds tests
  * xdgdesktopfile: Removes an not needed debug info
  * xdgdesktopfile: Removes double QLatin1String's contruction
  * XdgDesktopFileCache: Check if a file isValid() only when needed
  * XdgDesktopFile: Reworks XdgDesktopFileCache::getFile()
  * XdgDesktopFileCache: Check new acquired objects before using it
  * XdgDesktopFile: Removes unneeded assignment
  * XdgDesktopFile: Add break to switch case
  * qtxdg: Get the HOME environment variable just one time
  * Replace the QString % operator by the + operator
  * No more implicit string conversions
  * Moves QT_USE_QSTRINGBUILDER to the compiler_settings CMake module
  * XdgDesktopFileCache: Fixes an coding typing error
  * xdgiconloader: Fix typo in directoryMatchesSize
  * Xdgiconloader (#84)
  * Improve foreach iteraror performance
  * XdgDesktopFile: Improve the performance of the foreach loop
  * XdgDesktopFile: Use XdgDirs::userDir(), drop QStandardPaths()
  * XdgDesktopFile: Standardize text strings scope
  * XdgDesktopFile: Adds a Desktop File ID calculator method
  * XdgDesktopFile: Document Exec fallback when DBusActivatable fails
  * Adds QT_USE_QSTRINGBUILDER to the compile definitions
  * Adds the BUILD_DEV_UTILS to README.md
  * Makes the development utils build/install optional
  * XdgDesktopFile: Adds Exec fallback when DBusActivatable fails
  * Adds an .desktop file start tester
  * XdgDirs: Use Q_ASSERT to check for XdgDirs::userDirectory invalid values
  * XdgDirs: Use XdgDirs::UserDirectory enum instead of int
  * XdgDirs: Makes XdgDirs::userDir use userDirectoryFallback()
  * XdgDirs: Adds userDirDefault() method.
  * Adds XdgDesktopFile::mimeTypes() member
  * build: Enable C++11 usage
  * iconloader: Fix actualSize() for non-themed icons
  * desktopfile: Change validity check
  * Added Digia-Qt-LGPL-Exception-1.1
  * Update years and Licenses
  * desktopfile: Check validity of DBus object path
  * desktopfile: Don't invoke DBus call on invalid interface
  * XdgUserDirs: Return a fallback when the path is empty
  * README.md: Fix grammatical error, adjust wording
  * Update and rename README to README.md
  * xdgdesktopfile: handle 'Path' entry for application's working directory
  * Fix possible use of cachedIcon after free
  * Update release.sh server url
 1.3.0 / 2015-10-27
 ==================
  * Release 1.3.0
  * desktopfile: Remove support for $XDG_MOVIES_DIR (which doesn't exist)
  * Assorted style cleanups
  * Adds XdgDesktopFile != operator
  * Fixes the XdgMimeType == operator
  * Handles CMake policy CMP0063
  * Adds an compiler_settings CMake "module"
  * CMake: Adds Runtime install COMPONENT
  * Drops find_package(), use find_dependency()
  * Marks link libraries as PUBLIC
  * Handles in-tree builds headers the right way.
  * Narrows the scope of compile definitions
  * Improves create_pkgconfig_file.cmake
  * Use the Targets CMake stuff
  * Adds package version config info file
  * Code reordering
  * Use Qt5 style library names
  * Remove unneeded add_definitions()
  * Simplifies version variables a little bit
  * Removes unneeded include_directories()
  * Uses standard GNUInstallDirs instead of FindLibSuffix
  * Remove trailing whitespaces
  * added missing licensing headers
  * Backports Fixed icons lookup in QIcon::fromTheme
  * Adds XdgDirs tests
  * Adds XdgDirs::configHome() fallback default locations
  * XdgDesktopFile: Handles NotShowIn correctly
  * Fixes XdgDirs::dataHome() regression
  * QIconLoader: Change the order fallback icon lookup order
  * Gets rid of translations stuff
  * Cleans up empty comment lines
  * Remove Qt4 stuff from the documentation
  * Remove Qt4 stuff from the example and tests
  * Remove Qt4 stuff from the source files
  * Get rid of Qt4 stuff in the build system
 1.2.0 / 2015-03-29
 ==================
  * Release 1.2.0
  * Fixes XdgDesktop::isShow() caching mechanism
  * Add QtDBus/Qt5DBus dependency
  * Adds support for X-Categories
  * Adds support for X-OnlyShowIn and X-NotShowIn
  * Fixes an Qt4 FTBFS
  * Use QLatin1Char()
  * Adds platform-data handling
  * Make DBusActivatable work for Qt4 too
  * desktopfile: support for DBusActivatable applications
  * Adds a list of special non detachable execs
  * desktopfile: run new process as a direct child
  * Qt5: Use QStandardPaths() where possible
  * XdgDirs: Updates documentation.
  * String manipulation enhancements
  * Make sure returned directories don't have an trailing '/'
  * XdgDirs: postfix should always start with an /
  * XdgDirs::configHome() handle postfix slash
  * Fix XdgDirs::dataDirs() postfix handling
  * Replace empty quotes by QString()
  * XdgDesktopFileCache: Retrieve apps of a category
  * Quote all paths in the CMake stuff
  * Qt5: Use Qt5 private headers
  * Ignore empty dirs in xdgDirList()
  * Makes needed helper functions available to tests
  * - Fix compilation when using internal mime
  * Release with a proper versioned prefix
  * Avoid adding empty parent icon theme
  * Update license headers and add new license files
  * Use QPlatformTheme::SystemIconFallbackThemeName in static QString fallbackTheme()
  * QIconLoader: enable an easy case of transactional processing
  * QIconLoader: don't inherit QObject
  * QIconLoader: replace an inefficient QList with a QVector
  * QIconLoader: mark virtual overrides
  * QIconLoader: mark a helper type as movable
  * QIconLoader: replace while(!empty()) delete takeLast() with qDeleteAll()
  * QIconLoader: don't re-evaluate container.size() all the time (II)
  * QIconLoader: don't re-evaluate container.size() all the time
  * QIconLoader: remove another unused variable
  * QIconLoader: remove an unused variable
 1.1.0 / 2015-02-07
 ==================
  * Update the release script to sign packages
  * Sets visibility to hidden symbols for Clang
  * Move static const variable from a public .h file to the .cpp
  * Use gcc visibility attribute and Q_DECL_EXPORT macro to avoid exporting private symbols in the lib. This greatly reduced the size of dynamic symbol table and might potentially speed up loading. Also, turn off exception handling to save more since we don't use it. For non-gcc compilers, this change does nothing.
  * Makes the Qt5 build the default
  * Qt5: Updates CMake minimum required version
  * Qt4: Backport add fallback for unthemed app icons
  * add fallback for unthemed app icons
  * XdgDesktopFileCache::getFile(): Don't insert/removes non existent files
  * Enhance the loading of a .desktop file.
  * Adds helper functions prototypes
  * Fixes issue #7
  * Updates .gitignore
  * Removes i18n/i10n
  * Updates translations
  * Updates the translation infrastructure
  * Update Russian translation
  * Qt4: Fixes an FTBFS on Gentoo x86_64 when USE_QTMIMETYPES=On
  * Add a release script
 1.0.0 / 2014-09-06
 ==================
  * Release 1.0.0
  * Replaces XdgMimeInfo with XdgMimeType
  * Updates the cmake_minimum_required() version
  * Build system maintenance
  * if QT_VERSION < 5 load the qt4 header
  * Allows QIconLoader to search in multiple theme directories.
  * Fixes an FTBFS in the Qt4 build
  * Merge branch 'use-qt5-qiconloader'
  * Revert "Merge branch 'use-qt5-qiconloader'"
  * Revert "Fixes an FTBFS in the Qt4 build"
  * Fixes an FTBFS in the Qt4 build
  * Get and set XDG user dirs variables in config file
  * Honors /usr/share/pixmaps when searching for icons.
  * Adds xpm icon support
  * Adds Qt5 QIconLoader for the Qt5 build
  * Ports Qt5 commit: Make sure QIconLoader is always initialized
  * Use environment to trigger Qt5 builds
  * Fixes an XdgMimeInfo memory leak
  * Use case insensitive comparisons with desktop environment names
  * Updates some XdgDesktopFile methods documentation
  * Make desktop enviroment names comparisons case insensitive
  * solve failed comp LXQT with LXQt (OnlyShowIn=LXQt;) in desktop files
  * Re-adds Support XDG_CURRENT_DESKTOP in autostart handling
  * Deprecates non desktop environment neutral XdgDesktopFile methods
  * Revert "Support XDG_CURRENT_DESKTOP in autostart handling."
  * Adds QTXDG_DEPRECATED macro
  * Install pkgconfig files to /usr/local/libdata/pkgconfig in FreeBSD.
  * Set library dirs properly in qtxdg-config and use files.
 0.5.3 / 2014-05-08
 ==================
  * Release 0.5.3
  * Update some comments
 0.5.1 / 2014-05-05
 ==================
  * libqtxdg 0.5.1
  * Revert "Change default environment to LXQt"
  * Revert "Check for lxqt-applications instead of razor-applications"
  * Support XDG_CURRENT_DESKTOP in autostart handling.
  * Update .gitignore
  * Check for lxqt-applications instead of razor-applications
  * Change default environment to LXQt
  * Avoid XdgAction mnemonics caused by '&' symbol in the name of desktop app.
 0.1.0 / 2014-04-29
 ==================
  * Update AUTHORS and COPYING
  * Add CPack rules for creating tarball
  * Put iconloaderfix into own namespace
  * Adds an uninstall target
  * Fixes an FTBFS on the test target
  * Fixes an FTBFS when a mix of PIC and PIE compiler flags are used
  * Updates CMake's minimum required version
  * Adds Qt5Widgets to the required pkg-config required packages
  * test: Removes meaningless add_dependencies(..... razorqt)
  * Don't use STREQUAL to test the BUILD_TESTS option
  * Removed CMAKE_SOURCE_DIR usage from test/CMakeLists.txt
  * Adds missing ${CMAKE_INSTALL_PREFIX}
  * Fixes bugs in create_pkgconfig_file cmake macro
  * Use GNU installation directories
  * prefix parameter for autostartDirs, configDirs and dataDirs. (part2)
  * prefix parameter for autostartDirs, configDirs and dataDirs.
  * Updates buildsystem typical use documentation
  * Reformatting for an easy reading in a 80x24 terminal
  * Documents the QTXDG_QT_LIBRARIES variable
  * Adds an tiny example on how to use the lib
  * RazorLibSuffix.cmake -> ../cmake/FindLibSuffix.cmake and QUIET mode for find_package
  * Adds ${CMAKE_CURRENT_BINARY_DIR} to the include_directories list
  * Fix qtxdg_use.cmake and qtxdg-config.cmake generation location
  * Replace QDomNodeList::length() by QDomNodeList::size()
  * Portable headers
  * Adds pkg-config to Qt5Xdg
  * Renames the Qt5 build
  * Packs Qt version specific stuff
  * Removes unneeded set(QT_USE_QTXML TRUE)
  * qtxdg/test: Adapts the build system to support Qt4 and Qt5
  * qtxdg/test: Removes Qt4 CMake stuff
  * Adds missing library (Qt5Xml) to qtxdg target
  * qtxdg/test: Removes the project command and cmake_minimum_required()
  * Explicitly requires QtTest module
  * Make BUILD_TESTS an option
  * Replace Q_GLOBAL_STATIC_WITH_INITIALIZER
  * Replaces QIconEngineV2 with QIconEngine
  * Adds QMimeData include file
  * Port QString::toAscii()
  * Port QDesktopServices
  * Ran fixqt4headers
  * Adds support to Qt5 in the buildsystem
  * Adds test target to CMake
  * Use the QtTestLib facilities
  * Cmake find_package files for the QtXdg
  * Revert "Cmake find_package files"
  * Cmake find_package files
  * Add COPYING and AUTHORS files
  * X-RAZOR changed to Razor in desktop files
  * config-file-associations, mimetypeviewer: Replaced QTreeWidget with QTreeView and new class MimetypeItemModel as model
  * Improved (hopefuly) layout and look of config-fileassociations, application chooser
  * Clang complained about type mismatch
  * application-x-executable now fallback icon for desktopfiles of type Application
  * Added XdgMimeInfoCache
  * Added more info to XdgMime
  * XdgDesktopFileCache now holds list of all apps that can handle a given mimetype
  * Make QtXdg build by itself again
  * libraries: Removes unneeded include(RazorLibSuffix)
  * libraries: Removes unneeded cmake_minimum_required(VERSION 2.6)
  * libraries: Removes unneeded find_package(Qt4)
  * xdgdesktopfilecache now looks in <datadir or datahome>/applications/defaults.list for default app
  * Add getApps method to XdgDesktopFileCache - returns all applications that can handle a mimetype
  * Fix building with C++11
  * XdgDesktopFile: Don't strip quotes
  * initial fix for #520 XdgDesktopFileCache::getDefaultApp cache wrong behavior
  * Closes Issue #487
  * Set minimum percent to 1% for transifex in cmake
  * Translations updated
  * Translations updated
  * Soname was changed
  * Update translations
  * Translations updated
  * Removed line num from TS files.
  * Fix autostart dir detection when the env var is set
  * Updated .tx file
  * version bump to 0.4.99 (public "release candiates") for qtxdg
  * Translation for razor-sesion
  * Fixes in the qtxdg translations
  * Transifex resource renamed qtxdg->libqtxdg
  * Fix for Issue #290 Fails to build on BSD
  * New translations for libqtxdg
  * Starting the razor-confupdate from the razor-session.
  * Razor-confupdate:  fixes and .upd file for 0.4.1-0.5
  * Language name zh_CN.GB2312 braked cmake process.
  * Translations updated
  * Add operator== for XdgDesktopFile
  * Don't replace space with \s
  * Fixed for Preloading menu
  * Cleaning the code.
  * Move autostart directory code to XdgDirs
  * Improvements to the XdgMenu. Added changed signal.
  * Small speed opetimistaion in the qiconloader
  * Add function to remove entries from desktop files
  * Transifex desktop: sr_BA.ts should be a local
  * Transifex desktop: local translations
  * Transifex desktop: Translations pulled
  * Icons for the desktop menu
  * Add Traditional Chinese Translations
  * Translations update
  * Added support for the online translation service. www.transifex.net
  * Serbian translation files
  * Class documentation for XdgMimeInfo
  * Greek translation by iosifidis
  * Fix for issue #170. Escaping.
  * Fix for issue #170. Escaping.
  * Fix for issue #170
  * Fix for issue #170
  * Added danish translations
  * X-RAZOR -> Razor for autostart
  * Russian translation
  * RAZOR -> X-RAZOR
  * MINOR_VERSION & PATCH_VERSION for libraries
  * fix #169: italian translation
  * XdgAutoStart rewriten (lgpl2+)
  * Closes #158
  * Support icons with absolute path file names
  * LGPL2+ for qtxdg
  * Escape &'s to prevent Qt from using them for mnemonics
  * Revert "XdgDesktopFile: Display an actual ampersand character"
  * Update german [de] translation
  * Add setLocalizedValue() function
  * fixed qtxdg/translations/translate.sh
  * Add a constructor to generate basic XdgDesktopFiles
  * Correct the XdgAutoStart behavior
  * SVK translation finalized
  * Replaces return"" by return QString()
  * License audit
  * implemented #70: pkg-config for libs
  * Add Chinese(simplified) translation files.
  * fix #119 qtxdg bug and patch
  * License audit
  * Add Slovak (sk) translation
  * Czech translations (cs_CZ)
  * Fix doxygen documentation in xdgdesktopfile
  * New doxygen ifrastructure
  * devel-docs generated in CMAKE_BINARY_DIR/docs includig dummy index.html
  * missing translations in CMakeLists
  * XdgDesktopFile is implicitly shared
  * huge refactoring of the libraries build organization
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -2,24 +2,46 @@ cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
 project(libqtxdg)
 option(BUILD_TESTS "Builds tests" OFF)
 option(BUILD_DEV_UTILS "Builds and install development utils" OFF)
 # additional cmake files
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-set(QTXDG_MAJOR_VERSION 1)
+if (CMAKE_VERSION VERSION_LESS "3.1")
-set(QTXDG_MINOR_VERSION 3)
+    include(CheckCXXCompilerFlag)
    CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
    if(COMPILER_SUPPORTS_CXX11)
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
    else()
        CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
        # -std=c++0x is deprecated but some tools e.g. qmake or older gcc are still using it
        if(COMPILER_SUPPORTS_CXX0X)
            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
        else()
            message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER} does not support c++11/c++0x")
        endif()
    endif()
 else()
  set(CMAKE_CXX_STANDARD 11)
 endif()
 set(QTXDG_MAJOR_VERSION 2)
 set(QTXDG_MINOR_VERSION 0)
 set(QTXDG_PATCH_VERSION 0)
 set(QTXDG_VERSION_STRING ${QTXDG_MAJOR_VERSION}.${QTXDG_MINOR_VERSION}.${QTXDG_PATCH_VERSION})
 include(GNUInstallDirs)             # Standard directories for installation
 include(CMakePackageConfigHelpers)
 include(GenerateExportHeader)
 include(create_portable_headers)
 include(create_pkgconfig_file)
 include(compiler_settings NO_POLICY_SCOPE)
 find_package(Qt5Widgets REQUIRED QUIET)
 find_package(Qt5Svg REQUIRED QUIET)
 find_package(Qt5Xml REQUIRED QUIET)
 find_package(Qt5DBus REQUIRED QUIET)
 if (BUILD_TESTS)
    find_package(Qt5Test REQUIRED QUIET)
 endif()
@ -28,15 +50,16 @@ endif()
 set(QTXDGX_LIBRARY_NAME "Qt5Xdg")
 set(QTXDGX_FILE_NAME "qt5xdg")
 set(QTXDGX_ICONLOADER_LIBRARY_NAME "Qt5XdgIconLoader")
 set(QTXDGX_ICONLOADER_FILE_NAME "qt5xdgiconloader")
 set(QTXDGX_PKG_CONFIG_DESCRIPTION "Qt5Xdg, a Qt5 implementation of XDG standards")
-set(QTXDGX_PKG_CONFIG_REQUIRES "Qt5Core, Qt5Xml, Qt5Widgets, Qt5DBus")
+set(QTXDGX_PKG_CONFIG_REQUIRES "Qt5Core, Qt5Xml, Qt5Widgets, Qt5DBus, Qt5XdgIconLoader")
 set(QTXDGX_INTREE_INCLUDEDIR "${CMAKE_CURRENT_BINARY_DIR}/InTreeBuild/include")
-include_directories(
+set(QTXDGX_ICONLOADER_PKG_CONFIG_DESCRIPTION "Qt5XdgIconLader, a Qt5 XDG Icon Loader")
-    "${Qt5Gui_PRIVATE_INCLUDE_DIRS}"
+set(QTXDGX_ICONLOADER_PKG_CONFIG_REQUIRES "Qt5Gui, Qt5Svg")
 )
-set(QTX_LIBRARIES Qt5::Widgets Qt5::Xml Qt5::DBus)
+set(QTXDGX_INTREE_INCLUDEDIR "${CMAKE_CURRENT_BINARY_DIR}/InTreeBuild/include")
 if (NOT CMAKE_BUILD_TYPE)
    set ( CMAKE_BUILD_TYPE Release )
@ -44,101 +67,45 @@ endif (NOT CMAKE_BUILD_TYPE)
 message(STATUS "Building with Qt ${Qt5Core_VERSION_STRING}")
-set(libqtxdg_PUBLIC_H_FILES
+add_subdirectory(xdgiconloader)
-    xdgaction.h
+add_subdirectory(qtxdg)
    xdgdesktopfile.h
    xdgdirs.h
    xdgicon.h
    xdgmenu.h
    xdgmenuwidget.h
    xmlhelper.h
    xdgautostart.h
    xdgmacros.h
    xdgmimetype.h
 )
 set(libqtxdg_PUBLIC_CLASSES
    XdgAction
    XdgDesktopFile
    XdgDirs
    XdgIcon
    XdgMenu
    XdgMenuWidget
    XmlHelper
    XdgAutoStart
    XdgMimeType
 )
-set(libqtxdg_PRIVATE_H_FILES
+if(BUILD_TESTS)
-    xdgmenuapplinkprocessor.h
+    enable_testing()
-    xdgmenulayoutprocessor.h
+    target_compile_definitions(${QTXDGX_LIBRARY_NAME}
-    xdgmenu_p.h
+        PRIVATE "QTXDG_TESTS=\"1\""
-    xdgmenureader.h
+    )
-    xdgmenurules.h
+    add_subdirectory(test)
-    xdgdesktopfile_p.h
+else()
-)
+    message(STATUS "")
-
+    message(STATUS "For building tests use -DBUILD_TESTS=Yes option.")
-set(libqtxdg_CPP_FILES
+    message(STATUS "")
-    xdgaction.cpp
+endif()
    xdgdesktopfile.cpp
    xdgdirs.cpp
    xdgicon.cpp
    xdgmenuapplinkprocessor.cpp
    xdgmenu.cpp
    xdgmenulayoutprocessor.cpp
    xdgmenureader.cpp
    xdgmenurules.cpp
    xdgmenuwidget.cpp
    xmlhelper.cpp
    xdgautostart.cpp
    xdgmimetype.cpp
    qiconfix/qiconloader.cpp
 )
 set(libqtxdg_MOCS
    xdgaction.h
    xdgmenuapplinkprocessor.h
    xdgmenu.h
    xdgmenu_p.h
    xdgmenureader.h
    xdgmenurules.h
    xdgmenuwidget.h
 )
 set(libqtxdg_PRIVATE_INSTALLABLE_H_FILES
    qiconfix/qiconloader_p.h
 )
 QT5_WRAP_CPP(libqtxdg_CXX_FILES ${libqtxdg_MOCS})
 add_library(${QTXDGX_LIBRARY_NAME} SHARED
    ${libqtxdg_PUBLIC_H_FILES}
    ${libqtxdg_PRIVATE_H_FILES}
    ${libqtxdg_PRIVATE_INSTALLABLE_H_FILES}
    ${libqtxdg_PRIVATE_H_FILES}
    ${libqtxdg_CPP_FILES}
    ${libqtxdg_CXX_FILES}
 )
 if (BUILD_DEV_UTILS)
    add_subdirectory(util)
 endif()
-target_link_libraries(${QTXDGX_LIBRARY_NAME}
+configure_package_config_file(
-    PUBLIC
+    "${PROJECT_SOURCE_DIR}/cmake/${QTXDGX_FILE_NAME}-config.cmake.in"
-        ${QTX_LIBRARIES}
+    "${CMAKE_BINARY_DIR}/${QTXDGX_FILE_NAME}-config.cmake"
    INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${QTXDGX_FILE_NAME}"
 )
-set_target_properties(${QTXDGX_LIBRARY_NAME} PROPERTIES
+write_basic_package_version_file(
-  VERSION ${QTXDG_VERSION_STRING}
+    "${CMAKE_BINARY_DIR}/${QTXDGX_FILE_NAME}-config-version.cmake"
-  SOVERSION ${QTXDG_MAJOR_VERSION}
+    VERSION ${QTXDG_VERSION_STRING}
    COMPATIBILITY AnyNewerVersion
 )
 configure_package_config_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/${QTXDGX_FILE_NAME}-config.cmake.in"
+    "${PROJECT_SOURCE_DIR}/cmake/${QTXDGX_ICONLOADER_FILE_NAME}-config.cmake.in"
-    "${CMAKE_BINARY_DIR}/${QTXDGX_FILE_NAME}-config.cmake"
+    "${CMAKE_BINARY_DIR}/${QTXDGX_ICONLOADER_FILE_NAME}-config.cmake"
-    INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${QTXDGX_FILE_NAME}"
+    INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${QTXDGX_ICONLOADER_FILE_NAME}"
 )
 write_basic_package_version_file(
-    "${CMAKE_BINARY_DIR}/${QTXDGX_FILE_NAME}-config-version.cmake"
+    "${CMAKE_BINARY_DIR}/${QTXDGX_ICONLOADER_FILE_NAME}-config-version.cmake"
    VERSION ${QTXDG_VERSION_STRING}
    COMPATIBILITY AnyNewerVersion
 )
@ -150,97 +117,50 @@ create_pkgconfig_file(
    INCLUDEDIRS ${QTXDGX_FILE_NAME}
    LIBS ${QTXDGX_LIBRARY_NAME}
    REQUIRES ${QTXDGX_PKG_CONFIG_REQUIRES}
    REQUIRES_PRIVATE ${QTXDGX_ICONLOADER_LIBRARY_NAME}
    VERSION ${QTXDG_VERSION_STRING}
    INSTALL
 )
-target_compile_definitions(${QTXDGX_LIBRARY_NAME}
+create_pkgconfig_file(
-    PRIVATE "QTXDG_COMPILATION=\"1\""
+    PACKAGE_NAME ${QTXDGX_ICONLOADER_LIBRARY_NAME}
-)
+    DESCRIPTIVE_NAME ${QTXDGX_ICONLOADER_LIBRARY_NAME}
-
+    DESCRIPTION ${QTXDGX_ICONLOADER_PKG_CONFIG_DESCRIPTION}
-target_include_directories(${QTXDGX_LIBRARY_NAME}
+    INCLUDEDIRS ${QTXDGX_ICONLOADER_FILE_NAME}
-    INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_FILE_NAME}>"
+    LIBS ${QTXDGX_ICONLOADER_LIBRARY_NAME}
-    INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
+    REQUIRES ${QTXDGX_ICONLOADER_PKG_CONFIG_REQUIRES}
-    INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_FILE_NAME}/${QTXDG_VERSION_STRING}>"
+    VERSION ${QTXDG_VERSION_STRING}
-)
+    INSTALL
 # include directories and targets for the in tree build
 target_include_directories(${QTXDGX_LIBRARY_NAME}
    INTERFACE "$<BUILD_INTERFACE:${QTXDGX_INTREE_INCLUDEDIR}/${QTXDGX_FILE_NAME}>"
    INTERFACE "$<BUILD_INTERFACE:${QTXDGX_INTREE_INCLUDEDIR}>"
    INTERFACE "$<BUILD_INTERFACE:${QTXDGX_INTREE_INCLUDEDIR}/${QTXDGX_FILE_NAME}/${QTXDG_VERSION_STRING}>"
 )
 export(TARGETS ${QTXDGX_LIBRARY_NAME} FILE "${CMAKE_BINARY_DIR}/${QTXDGX_FILE_NAME}-targets.cmake")
 # end of in tree build stuff
 # create the portble headers
 create_portable_headers(libqtxdg_PORTABLE_HEADERS
    HEADER_NAMES ${libqtxdg_PUBLIC_CLASSES}
    OUTPUT_DIR "${QTXDGX_INTREE_INCLUDEDIR}/${QTXDGX_FILE_NAME}"
 )
 # Copy public headers (in tree building)
 foreach(h ${libqtxdg_PUBLIC_H_FILES})
    get_filename_component(bh ${h} NAME)
    configure_file(${h} "${QTXDGX_INTREE_INCLUDEDIR}/${QTXDGX_FILE_NAME}/${bh}" COPYONLY)
 endforeach()
 # Copy private headers (in tree building)
 foreach(h ${libqtxdg_PRIVATE_INSTALLABLE_H_FILES})
    get_filename_component(bh ${h} NAME)
    configure_file(${h} "${QTXDGX_INTREE_INCLUDEDIR}/${QTXDGX_FILE_NAME}/${QTXDG_VERSION_STRING}/private/qtxdg/${bh}" COPYONLY)
 endforeach()
 install(TARGETS
    ${QTXDGX_LIBRARY_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}"
    EXPORT "${QTXDGX_FILE_NAME}-targets"
    COMPONENT Runtime
 )
 install(EXPORT
    "${QTXDGX_FILE_NAME}-targets"
    DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${QTXDGX_FILE_NAME}"
    COMPONENT Devel
 )
 install(FILES
-    ${libqtxdg_PUBLIC_H_FILES}
+    "${CMAKE_BINARY_DIR}/${QTXDGX_FILE_NAME}-config.cmake"
-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_FILE_NAME}"
+    "${CMAKE_BINARY_DIR}/${QTXDGX_FILE_NAME}-config-version.cmake"
    DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${QTXDGX_FILE_NAME}"
    COMPONENT Devel
 )
 install(FILES
-    ${libqtxdg_PRIVATE_INSTALLABLE_H_FILES}
+    "${CMAKE_BINARY_DIR}/${QTXDGX_ICONLOADER_FILE_NAME}-config.cmake"
-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_FILE_NAME}/${QTXDG_VERSION_STRING}/private/qtxdg"
+    "${CMAKE_BINARY_DIR}/${QTXDGX_ICONLOADER_FILE_NAME}-config-version.cmake"
    DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${QTXDGX_ICONLOADER_FILE_NAME}"
    COMPONENT Devel
 )
-install(FILES
+install(EXPORT
-    "${CMAKE_BINARY_DIR}/${QTXDGX_FILE_NAME}-config.cmake"
+    "${QTXDGX_FILE_NAME}-targets"
    "${CMAKE_BINARY_DIR}/${QTXDGX_FILE_NAME}-config-version.cmake"
    DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${QTXDGX_FILE_NAME}"
    FILE "${QTXDGX_FILE_NAME}-targets.cmake"
    COMPONENT Devel
 )
-install(FILES
+install(EXPORT
-    ${libqtxdg_PORTABLE_HEADERS}
+    "${QTXDGX_ICONLOADER_FILE_NAME}-targets"
-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_FILE_NAME}"
+    DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${QTXDGX_ICONLOADER_FILE_NAME}"
    FILE "${QTXDGX_ICONLOADER_FILE_NAME}-targets.cmake"
    COMPONENT Devel
 )
 if(BUILD_TESTS)
    enable_testing()
    target_compile_definitions(${QTXDGX_LIBRARY_NAME}
        PRIVATE "QTXDG_TESTS=\"1\""
    )
    add_subdirectory(test)
 else()
    message(STATUS "")
    message(STATUS "For building tests use -DBUILD_TESTS=Yes option.")
    message(STATUS "")
 endif()
 # uninstall target
 configure_file(
    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
--- a/Digia-Qt-LGPL-Exception-1.1
+++ b/Digia-Qt-LGPL-Exception-1.1
@ -0,0 +1,22 @@
 Digia Qt LGPL Exception version 1.1
 As an additional permission to the GNU Lesser General Public License version
 2.1, the object code form of a "work that uses the Library" may incorporate
 material from a header file that is part of the Library.  You may distribute
 such object code under terms of your choice, provided that:
    (i)   the header files of the Library have not been modified; and 
    (ii)  the incorporated material is limited to numerical parameters, data
          structure layouts, accessors, macros, inline functions and
          templates; and
    (iii) you comply with the terms of Section 6 of the GNU Lesser General
          Public License version 2.1.
 Moreover, you may apply this exception to a modified version of the Library,
 provided that such modification does not involve copying material from the
 Library into the modified Library's header files unless such material is
 limited to (i) numerical parameters; (ii) data structure layouts;
 (iii) accessors; and (iv) small macros, templates and inline functions of
 five lines or less in length.
 Furthermore, you are not required to apply this additional permission to a
 modified version of the Library.
--- a/25
+++ b/25
@ -1,25 +0,0 @@
 Overview
 ========
 libqtxdg is An Qt implementation of freedesktop.org xdg specifications.
 It's built with Qt5.
 Dependencies
 ============
    Qt5
 Configuration
 ============
 libqtxdg uses the CMake build system. Everything that applies to CMake also
 applies here.
 Configuration options:
    BUILD_TESTS         Builds tests, defaults to OFF
 Configuration Examples:
    Build library  and build self tests:
        cmake -DBUILD_TESTS=ON ..
    Build the library without building self tests
        cmake ..
--- a/README.md
+++ b/README.md
@ -0,0 +1,27 @@
 # libqtxdg
 ## Overview
 `libqtxdg` is a Qt 5 implementation of freedesktop.org XDG specifications.   
 It is maintained by the LXQt project and nearly all LXQt components are depending on it. Yet it can be used independently from this desktop environment, too.   
 The library is able to use GTK+ icon theme caches for faster icon lookup. The cache file can be generated with utility `gtk-update-icon-cache` on a theme directory. If the cache is not present, corrupted, or outdated, the normal slow lookup is still run.   
 ## Installation
 ### Sources
 At runtime qtbase is needed. gtk-update-icon-cache represents an optional runtime dependency for the reasons stated above.   
 Additional build dependencies are CMake, qtsvg, qttools and optionally Git to pull latest VCS checkouts.
 The code configuration is handled by CMake so all corresponding generic instructions apply. Specific CMake variables are
 * BUILD_TESTS to build tests. Disabled by default (`OFF`).
 * BUILD_DEV_UTILS which builds and installs development utils. Disabled by default as well.
 To build and install run `make` and `make install`respectively.
 ### Binary packages
 The library is provided by all major Linux distributions like Arch Linux, Debian, Fedora and openSUSE.   
 Just use the distributions' package managers to search for string `libqtxdg`.
--- a/cmake/compiler_settings.cmake
+++ b/cmake/compiler_settings.cmake
@ -92,3 +92,14 @@ set(QTXDG_COMMON_WARNING_FLAGS "-Wall")
 #-----------------------------------------------------------------------------
 list(APPEND QTXDG_WARNING_FLAGS ${QTXDG_COMMON_WARNING_FLAGS})
 add_definitions(${QTXDG_WARNING_FLAGS})
 #-----------------------------------------------------------------------------
 # String conversion flags
 #-----------------------------------------------------------------------------
 add_definitions(
    -DQT_USE_QSTRINGBUILDER
    -DQT_NO_CAST_FROM_ASCII
    -DQT_NO_CAST_TO_ASCII
    -DQT_NO_URL_CAST_FROM_STRING
    -DQT_NO_CAST_FROM_BYTEARRAY
 )
--- a/cmake/qt5xdg-config.cmake.in
+++ b/cmake/qt5xdg-config.cmake.in
@ -5,6 +5,7 @@ include(CMakeFindDependencyMacro)
 find_dependency(Qt5Widgets)
 find_dependency(Qt5Xml)
 find_dependency(Qt5DBus)
 find_dependency(Qt5XdgIconLoader)
 if (CMAKE_VERSION VERSION_GREATER 2.8.12)
    cmake_policy(SET CMP0024 OLD)
--- a/cmake/qt5xdgiconloader-config.cmake.in
+++ b/cmake/qt5xdgiconloader-config.cmake.in
@ -0,0 +1,11 @@
@PACKAGE_INIT@
 include(CMakeFindDependencyMacro)
 find_dependency(Qt5Gui)
 find_dependency(Qt5Svg)
 if (CMAKE_VERSION VERSION_GREATER 2.8.12)
    cmake_policy(SET CMP0024 OLD)
 endif()
 include("${CMAKE_CURRENT_LIST_DIR}/qt5xdgiconloader-targets.cmake")
--- a/debian/.gitignore
+++ b/debian/.gitignore
@ -1,9 +1,12 @@
 /*.debhelper
 /*.log
 /*.substvars
 /debhelper-build-stamp
 /files
-/libqt5xdg1/
+
-/libqt5xdg1-dbg/
+/libqt5xdg2/
 /libqt5xdg-dev/
 /libqt5xdgiconloader-dev/
 /libqt5xdgiconloader2/
 /tmp
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,24 @@
 libqtxdg (2.0.0-4) unstable; urgency=medium
  * Cherry-picked new upstream release 2.0.0.
  * Added current signing key
  * Bumped compat to 10
  * Bumped debhelper to (>= 10)
  * Added build dependency libqt5svg5-dev
  * Renamed package libqt5xdg1 -> libqt5xdg2 (soname bump)
  * Added packages libqt5xdgiconloader2 and libqt5xdgiconloader-dev
  * XdgIconLoader: Recommend gtk-update-icon-cache
    Thanks Rohan Garg <rohan@kde.org>
  * Renamed install and symbols files
  * Fixed symbols
  * Fixed .gitignore
  * Reworked descriptions in debian/control to prevent lintian whining
  * Fixed copyright for xdgiconloader
  * Added README.md to debian/docs
  * Set CMAKE_BUILD_TYPE=RelWithDebInfo
 -- Alf Gaida <agaida@siduction.org>  Sat, 09 Jul 2016 20:16:32 +0200
 libqtxdg (1.3.0-4) unstable; urgency=medium
  * Added libfile-mimeinfo-perl as dependency, we really need this, a
--- a/debian/compat
+++ b/debian/compat
@ -1 +1 @@
-9
+10
--- a/debian/control
+++ b/debian/control
@ -5,19 +5,20 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
           Andrew Lee (李健秋) <ajqlee@debian.org>
 Section: libs
 Priority: optional
-Build-Depends: cmake (>= 3.0.2),
+Build-Depends: debhelper (>= 10),
-               debhelper (>= 9),
+               cmake (>= 3.0.2),
               libmagic-dev,
               libqt5svg5-dev,
               pkg-config,
               qtbase5-private-dev,
               qttools5-dev,
               qttools5-dev-tools
 Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/git/pkg-lxqt/libqtxdg.git/?h=debian/sid
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/libqtxdg.git/?h=debian/sid
 Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/libqtxdg.git -b debian/sid
 Homepage: https://github.com/lxde/libqtxdg
-Package: libqt5xdg1
+Package: libqt5xdg2
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
@ -25,19 +26,45 @@ Depends: ${shlibs:Depends},
         libfile-mimeinfo-perl
 Pre-Depends: ${misc:Pre-Depends}
 Provides: libqt5xdg
-Description: Implementation of the XDG Specifications for Qt, libs
+Description: Implementation of the XDG Specifications for Qt (shared lib)
 This library implements functions of the XDG Specifications in Qt.  It is part
 of LXQt.
 .
 This package provides the shared library.
 Package: libqt5xdgiconloader2
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends},
         ${misc:Depends}
 Recommends: gtk-update-icon-cache
 Pre-Depends: ${misc:Pre-Depends}
 Provides: libqt5xdgiconloader
 Description: Implementation of the XDG Iconloader for Qt (shared lib)
 This library implements the backend to load icons which are handled according
 to the XDG Icon Theme Specification in Qt. It is part of LXQt.
 .
 This package provides the shared library.
 Package: libqt5xdg-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
-         libqt5xdg1 (= ${binary:Version})
+         libqt5xdg2 (= ${binary:Version}),
         libqt5xdgiconloader-dev (= ${binary:Version})
 Description: Development files for libqtxdg
- This library implements functions of the XDG Specifications in Qt.  It is part
+ This library implements functions of the XDG Specifications in Qt. It is part
 of LXQt.
 .
 This package provides development files.
 Package: libqt5xdgiconloader-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends},
         libqt5xdgiconloader2 (= ${binary:Version})
 Description: Development files for libqtxdgiconloader
 This library implements the backend to load icons which are handled according
 to the XDG Icon Theme Specification in Qt. It is part of LXQt.
 .
 This package provides development files.
--- a/debian/copyright
+++ b/debian/copyright
@ -1,14 +1,16 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libqtxdg
 Source: https://github.com/lxde/libqtxdg
 Files: *
-Copyright: 2012-2015 LXQt team
+Copyright: 2012-2016 LXQt team
           2010-2012 Razor team
 License: LGPL-2.1+
-Files: qiconfix/qiconloader_p.h qiconfix/qiconloader.cpp
+
-Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
+Files: xdgiconloader/xdgiconloader_p.h
       xdgiconloader/xdgiconloader.cpp
 Copyright: 2014 Digia Plc and/or its subsidiary(-ies).
 License: LGPL-2.1-or-3-with-Digia-1.1-exception
 Files: debian/*
--- a/debian/docs
+++ b/debian/docs
@ -1,2 +1,2 @@
 AUTHORS
-README
+README.md
--- a/debian/libqt5xdg-dev.install
+++ b/debian/libqt5xdg-dev.install
@ -1,4 +1,6 @@
-usr/include/*
+usr/include/qt5xdg
-usr/lib/*/lib*.so
+
-usr/lib/*/pkgconfig/*
+usr/lib/*/libQt5Xdg.so
-usr/share/cmake/*
+usr/lib/*/pkgconfig/Qt5Xdg.pc 
 usr/share/cmake/qt5xdg/
--- a/debian/libqt5xdg1.install
+++ b/debian/libqt5xdg1.install
@ -1 +0,0 @@
 usr/lib/*/lib*.so.*
--- a/debian/libqt5xdg2.install
+++ b/debian/libqt5xdg2.install
@ -0,0 +1 @@
 usr/lib/*/libQt5Xdg.so.*
--- a/debian/libqt5xdg2.symbols
+++ b/debian/libqt5xdg2.symbols
@ -1,157 +1,135 @@
-libQt5Xdg.so.1 libqt5xdg1 #MINVER#
+libQt5Xdg.so.2 libqt5xdg2 #MINVER#
- (c++)"XdgMimeType::XdgMimeType(QMimeType const&)@Base" 1.0.0
+ (c++)"XdgAction::XdgAction(QObject*)@Base" 1.0.0
- (c++)"XdgMimeType::XdgMimeType(XdgMimeType const&)@Base" 1.0.0
+ (c++)"XdgAction::XdgAction(QString const&, QObject*)@Base" 1.0.0
- (c++)"XdgMimeType::XdgMimeType()@Base" 1.0.0
+ (c++)"XdgAction::XdgAction(XdgAction const&, QObject*)@Base" 1.0.0
- (c++)"XdgMimeType::XdgMimeType(QMimeType const&)@Base" 1.0.0
+ (c++)"XdgAction::XdgAction(XdgDesktopFile const&, QObject*)@Base" 1.0.0
- (c++)"XdgMimeType::XdgMimeType(XdgMimeType const&)@Base" 1.0.0
+ (c++)"XdgAction::XdgAction(XdgDesktopFile const*, QObject*)@Base" 1.0.0
- (c++)"XdgMimeType::XdgMimeType()@Base" 1.0.0
+ (c++)"XdgAction::isValid() const@Base" 1.0.0
- (c++)"XdgMimeType::~XdgMimeType()@Base" 1.0.0
+ (c++)"XdgAction::load(XdgDesktopFile const&)@Base" 1.0.0
- (c++)"XdgMimeType::operator=(XdgMimeType const&)@Base" 1.0.0
+ (c++)"XdgAction::metaObject() const@Base" 1.0.0
 (c++)"XdgAction::operator=(XdgAction const&)@Base" 1.0.0
 (c++)"XdgAction::qt_metacall(QMetaObject::Call, int, void**)@Base" 1.0.0
 (c++)"XdgAction::qt_metacast(char const*)@Base" 1.0.0
 (c++)"XdgAction::runConmmand() const@Base" 1.0.0
 (c++)"XdgAction::staticMetaObject@Base" 1.0.0
 (c++)"XdgAction::updateIcon()@Base" 1.0.0
 (c++)"XdgAction::~XdgAction()@Base" 1.0.0
 (c++)"XdgAutoStart::desktopFileList(QStringList, bool)@Base" 1.0.0
 (c++)"XdgAutoStart::desktopFileList(bool)@Base" 1.0.0
 (c++)"XdgAutoStart::localPath(XdgDesktopFile const&)@Base" 1.0.0
- (c++)"XdgMenuWidget::qt_metacall(QMetaObject::Call, int, void**)@Base" 1.0.0
+ (c++)"XdgDesktopFile::XdgDesktopFile()@Base" 1.0.0
- (c++)"XdgMenuWidget::qt_metacast(char const*)@Base" 1.0.0
+ (c++)"XdgDesktopFile::XdgDesktopFile(XdgDesktopFile const&)@Base" 1.0.0
- (c++)"XdgMenuWidget::staticMetaObject@Base" 1.0.0
+ (c++)"XdgDesktopFile::XdgDesktopFile(XdgDesktopFile::Type, QString const&, QString const&)@Base" 1.0.0
- (c++)"XdgMenuWidget::event(QEvent*)@Base" 1.0.0
+ (c++)"XdgDesktopFile::categories() const@Base" 1.2.0
- (c++)"XdgMenuWidget::XdgMenuWidget(QDomElement const&, QWidget*)@Base" 1.0.0
+ (c++)"XdgDesktopFile::contains(QString const&) const@Base" 1.0.0
- (c++)"XdgMenuWidget::XdgMenuWidget(XdgMenu const&, QString const&, QWidget*)@Base" 1.0.0
+ (c++)"XdgDesktopFile::expandExecString(QStringList const&) const@Base" 1.0.0
- (c++)"XdgMenuWidget::XdgMenuWidget(XdgMenuWidget const&, QWidget*)@Base" 1.0.0
+ (c++)"XdgDesktopFile::fileName() const@Base" 1.0.0
- (c++)"XdgMenuWidget::XdgMenuWidget(QDomElement const&, QWidget*)@Base" 1.0.0
+ (c++)"XdgDesktopFile::icon(QIcon const&) const@Base" 1.0.0
- (c++)"XdgMenuWidget::XdgMenuWidget(XdgMenu const&, QString const&, QWidget*)@Base" 1.0.0
+ (c++)"XdgDesktopFile::iconName() const@Base" 1.0.0
- (c++)"XdgMenuWidget::XdgMenuWidget(XdgMenuWidget const&, QWidget*)@Base" 1.0.0
+ (c++)"XdgDesktopFile::id(QString const&, bool)@Base" 2.0.0
- (c++)"XdgMenuWidget::~XdgMenuWidget()@Base" 1.0.0
+ (c++)"XdgDesktopFile::isShown(QString const&) const@Base" 1.0.0
- (c++)"XdgMenuWidget::operator=(XdgMenuWidget const&)@Base" 1.0.0
+ (c++)"XdgDesktopFile::isSuitable(bool, QString const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::isValid() const@Base" 1.0.0
 (c++)"XdgDesktopFile::load(QString const&)@Base" 1.0.0
 (c++)"XdgDesktopFile::localizedKey(QString const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::localizedValue(QString const&, QVariant const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::mimeTypes() const@Base" 1.3.0
 (c++)"XdgDesktopFile::operator=(XdgDesktopFile const&)@Base" 1.0.0
 (c++)"XdgDesktopFile::operator==(XdgDesktopFile const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::removeEntry(QString const&)@Base" 1.0.0
 (c++)"XdgDesktopFile::save(QIODevice*) const@Base" 1.0.0
 (c++)"XdgDesktopFile::save(QString const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::setLocalizedValue(QString const&, QVariant const&)@Base" 1.0.0
 (c++)"XdgDesktopFile::load(QString const&)@Base" 1.0.0
 (c++)"XdgDesktopFile::setValue(QString const&, QVariant const&)@Base" 1.0.0
- (c++)"XdgDesktopFile::XdgDesktopFile(XdgDesktopFile::Type, QString const&, QString const&)@Base" 1.0.0
+ (c++)"XdgDesktopFile::startDetached(QString const&) const@Base" 1.0.0
- (c++)"XdgDesktopFile::XdgDesktopFile(XdgDesktopFile const&)@Base" 1.0.0
+ (c++)"XdgDesktopFile::startDetached(QStringList const&) const@Base" 1.0.0
- (c++)"XdgDesktopFile::XdgDesktopFile()@Base" 1.0.0
+ (c++)"XdgDesktopFile::type() const@Base" 1.0.0
- (c++)"XdgDesktopFile::XdgDesktopFile(XdgDesktopFile::Type, QString const&, QString const&)@Base" 1.0.0
+ (c++)"XdgDesktopFile::url() const@Base" 1.0.0
- (c++)"XdgDesktopFile::XdgDesktopFile(XdgDesktopFile const&)@Base" 1.0.0
+ (c++)"XdgDesktopFile::value(QString const&, QVariant const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::XdgDesktopFile()@Base" 1.0.0
 (c++)"XdgDesktopFile::~XdgDesktopFile()@Base" 1.0.0
- (c++)"XdgDesktopFile::operator=(XdgDesktopFile const&)@Base" 1.0.0
+ (c++)"XdgDesktopFileCache::XdgDesktopFileCache()@Base" 1.0.0
 (c++)"XdgDesktopFileCache::initialize(QString const&)@Base" 1.0.0
 (c++)"XdgDesktopFileCache::initialize()@Base" 1.0.0
 (c++)"XdgDesktopFileCache::getAllFiles()@Base" 1.0.0
 (c++)"XdgDesktopFileCache::getDefaultApp(QString const&)@Base" 1.0.0
 (c++)"XdgDesktopFileCache::getAppsOfCategory(QString const&)@Base" 1.2.0
 (c++)"XdgDesktopFileCache::desktopFileSettingsFormat()@Base" 1.0.0
- (c++)"XdgDesktopFileCache::load(QString const&)@Base" 1.0.0
+ (c++)"XdgDesktopFileCache::getAllFiles()@Base" 1.0.0
 (c++)"XdgDesktopFileCache::getApps(QString const&)@Base" 1.0.0
 (c++)"XdgDesktopFileCache::getAppsOfCategory(QString const&)@Base" 1.2.0
 (c++)"XdgDesktopFileCache::getDefaultApp(QString const&)@Base" 1.0.0
 (c++)"XdgDesktopFileCache::getFile(QString const&)@Base" 1.0.0
 (c++)"XdgDesktopFileCache::initialize()@Base" 1.0.0
 (c++)"XdgDesktopFileCache::initialize(QString const&)@Base" 1.0.0
 (c++)"XdgDesktopFileCache::instance()@Base" 1.0.0
- (c++)"XdgDesktopFileCache::XdgDesktopFileCache()@Base" 1.0.0
+ (c++)"XdgDesktopFileCache::load(QString const&)@Base" 1.0.0
 (c++)"XdgDesktopFileCache::~XdgDesktopFileCache()@Base" 1.0.0
- (c++)"QtXdg::QIconLoader::setThemeName(QString const&)@Base" 1.0.0
+ (c++)"XdgDirs::autostartDirs(QString const&)@Base" 1.0.0
- (c++)"QtXdg::QIconLoader::ensureInitialized()@Base" 1.0.0
+ (c++)"XdgDirs::autostartHome(bool)@Base" 1.0.0
- (c++)"QtXdg::QIconLoader::updateSystemTheme()@Base" 1.0.0
+ (c++)"XdgDirs::cacheHome(bool)@Base" 1.0.0
 (c++)"QtXdg::QIconLoader::setThemeSearchPath(QStringList const&)@Base" 1.0.0
 (c++)"QtXdg::QIconLoader::instance()@Base" 1.0.0
 (c++)"QtXdg::QIconLoader::QIconLoader()@Base" 1.0.0
 (c++)"XdgDirs::configDirs(QString const&)@Base" 1.0.0
 (c++)"XdgDirs::configHome(bool)@Base" 1.0.0
 (c++)"XdgDirs::dataDirs(QString const&)@Base" 1.0.0
 (c++)"XdgDirs::dataHome(bool)@Base" 1.0.0
 (c++)"XdgDirs::runtimeDir()@Base" 1.0.0
 (c++)"XdgDirs::setUserDir(XdgDirs::UserDirectory, QString const&, bool)@Base" 1.0.0
 (c++)"XdgDirs::autostartDirs(QString const&)@Base" 1.0.0
 (c++)"XdgDirs::autostartHome(bool)@Base" 1.0.0
 (c++)"XdgDirs::userDir(XdgDirs::UserDirectory)@Base" 1.0.0
- (c++)"XdgDirs::dataDirs(QString const&)@Base" 1.0.0
+ (c++)"XdgDirs::userDirDefault(XdgDirs::UserDirectory)@Base" 1.3.0
- (c++)"XdgDirs::dataHome(bool)@Base" 1.0.0
+ (c++)"XdgIcon::XdgIcon()@Base" 1.0.0
 (c++)"XdgDirs::cacheHome(bool)@Base" 1.0.0
 (c++)"XdgIcon::setThemeName(QString const&)@Base" 1.0.0
 (c++)"XdgIcon::defaultApplicationIcon()@Base" 1.0.0
 (c++)"XdgIcon::defaultApplicationIconName()@Base" 1.0.0
 (c++)"XdgIcon::fromTheme(QStringList const&, QIcon const&)@Base" 1.0.0
 (c++)"XdgIcon::fromTheme(QString const&, QIcon const&)@Base" 1.0.0
 (c++)"XdgIcon::fromTheme(QString const&, QString const&, QString const&, QString const&, QString const&)@Base" 1.0.0
 (c++)"XdgIcon::fromTheme(QStringList const&, QIcon const&)@Base" 1.0.0
 (c++)"XdgIcon::setThemeName(QString const&)@Base" 1.0.0
 (c++)"XdgIcon::themeName()@Base" 1.0.0
 (c++)"XdgIcon::XdgIcon()@Base" 1.0.0
 (c++)"XdgIcon::~XdgIcon()@Base" 1.0.0
- (c++)"XdgMenu::qt_metacall(QMetaObject::Call, int, void**)@Base" 1.0.0
+ (c++)"XdgMenu::XdgMenu(QObject*)@Base" 1.0.0
 (c++)"XdgMenu::qt_metacast(char const*)@Base" 1.0.0
 (c++)"XdgMenu::addWatchPath(QString const&)@Base" 1.0.0
 (c++)"XdgMenu::changed()@Base" 1.0.0
 (c++)"XdgMenu::environments()@Base" 1.0.0
 (c++)"XdgMenu::errorString() const@Base" 1.0.0
 (c++)"XdgMenu::findMenu(QDomElement&, QString const&, bool)@Base" 1.0.0
 (c++)"XdgMenu::getMenuFileName(QString const&)@Base" 1.0.0
- (c++)"XdgMenu::setEnvironments(QStringList const&)@Base" 1.0.0
+ (c++)"XdgMenu::isOutDated() const@Base" 1.0.0
- (c++)"XdgMenu::setEnvironments(QString const&)@Base" 1.0.0
+ (c++)"XdgMenu::logDir() const@Base" 1.0.0
- (c++)"XdgMenu::staticMetaObject@Base" 1.0.0
+ (c++)"XdgMenu::menuFileName() const@Base" 1.0.0
 (c++)"XdgMenu::metaObject() const@Base" 1.0.0
 (c++)"XdgMenu::qt_metacall(QMetaObject::Call, int, void**)@Base" 1.0.0
 (c++)"XdgMenu::qt_metacast(char const*)@Base" 1.0.0
 (c++)"XdgMenu::read(QString const&)@Base" 1.0.0
 (c++)"XdgMenu::save(QString const&)@Base" 1.0.0
- (c++)"XdgMenu::changed()@Base" 1.0.0
+ (c++)"XdgMenu::setEnvironments(QString const&)@Base" 1.0.0
- (c++)"XdgMenu::findMenu(QDomElement&, QString const&, bool)@Base" 1.0.0
+ (c++)"XdgMenu::setEnvironments(QStringList const&)@Base" 1.0.0
 (c++)"XdgMenu::setLogDir(QString const&)@Base" 1.0.0
- (c++)"XdgMenu::XdgMenu(QObject*)@Base" 1.0.0
+ (c++)"XdgMenu::staticMetaObject@Base" 1.0.0
 (c++)"XdgMenu::xml() const@Base" 1.0.0
 (c++)"XdgMenu::~XdgMenu()@Base" 1.0.0
- (c++)"XdgAction::updateIcon()@Base" 1.0.0
+ (c++)"XdgMenuWidget::XdgMenuWidget(QDomElement const&, QWidget*)@Base" 1.0.0
- (c++)"XdgAction::qt_metacall(QMetaObject::Call, int, void**)@Base" 1.0.0
+ (c++)"XdgMenuWidget::XdgMenuWidget(XdgMenu const&, QString const&, QWidget*)@Base" 1.0.0
- (c++)"XdgAction::qt_metacast(char const*)@Base" 1.0.0
+ (c++)"XdgMenuWidget::XdgMenuWidget(XdgMenuWidget const&, QWidget*)@Base" 1.0.0
- (c++)"XdgAction::staticMetaObject@Base" 1.0.0
+ (c++)"XdgMenuWidget::event(QEvent*)@Base" 1.0.0
- (c++)"XdgAction::load(XdgDesktopFile const&)@Base" 1.0.0
+ (c++)"XdgMenuWidget::metaObject() const@Base" 1.0.0
- (c++)"XdgAction::XdgAction(QObject*)@Base" 1.0.0
+ (c++)"XdgMenuWidget::operator=(XdgMenuWidget const&)@Base" 1.0.0
- (c++)"XdgAction::XdgAction(XdgDesktopFile const*, QObject*)@Base" 1.0.0
+ (c++)"XdgMenuWidget::qt_metacall(QMetaObject::Call, int, void**)@Base" 1.0.0
- (c++)"XdgAction::XdgAction(XdgDesktopFile const&, QObject*)@Base" 1.0.0
+ (c++)"XdgMenuWidget::qt_metacast(char const*)@Base" 1.0.0
- (c++)"XdgAction::XdgAction(QString const&, QObject*)@Base" 1.0.0
+ (c++)"XdgMenuWidget::staticMetaObject@Base" 1.0.0
- (c++)"XdgAction::XdgAction(XdgAction const&, QObject*)@Base" 1.0.0
+ (c++)"XdgMenuWidget::~XdgMenuWidget()@Base" 1.0.0
- (c++)"XdgAction::XdgAction(QObject*)@Base" 1.0.0
+ (c++)"XdgMimeType::XdgMimeType()@Base" 1.0.0
- (c++)"XdgAction::XdgAction(XdgDesktopFile const*, QObject*)@Base" 1.0.0
+ (c++)"XdgMimeType::XdgMimeType(QMimeType const&)@Base" 1.0.0
- (c++)"XdgAction::XdgAction(XdgDesktopFile const&, QObject*)@Base" 1.0.0
+ (c++)"XdgMimeType::XdgMimeType(XdgMimeType const&)@Base" 1.0.0
 (c++)"XdgAction::XdgAction(QString const&, QObject*)@Base" 1.0.0
 (c++)"XdgAction::XdgAction(XdgAction const&, QObject*)@Base" 1.0.0
 (c++)"XdgAction::~XdgAction()@Base" 1.0.0
 (c++)"XdgAction::operator=(XdgAction const&)@Base" 1.0.0
 (c++)"XdgMimeType::icon() const@Base" 1.0.0
 (c++)"XdgMimeType::iconName() const@Base" 1.0.0
- (c++)"XdgMenuWidget::metaObject() const@Base" 1.0.0
+ (c++)"XdgMimeType::operator=(XdgMimeType const&)@Base" 1.0.0
- (c++)"XdgDesktopFile::categories() const@Base" 1.2.0
+ (c++)"XdgMimeType::~XdgMimeType()@Base" 1.0.0
- (c++)"XdgDesktopFile::isSuitable(bool, QString const&) const@Base" 1.0.0
+ (c++)"non-virtual thunk to XdgMenuWidget::~XdgMenuWidget()@Base" 1.0.0
- (c++)"XdgDesktopFile::isApplicable(bool, QString const&) const@Base" 1.0.0
+ (c++)"typeinfo for XdgAction@Base" 1.0.0
 (c++)"XdgDesktopFile::localizedKey(QString const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::startDetached(QStringList const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::startDetached(QString const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::localizedValue(QString const&, QVariant const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::expandExecString(QStringList const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::url() const@Base" 1.0.0
 (c++)"XdgDesktopFile::icon(QIcon const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::save(QIODevice*) const@Base" 1.0.0
 (c++)"XdgDesktopFile::save(QString const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::type() const@Base" 1.0.0
 (c++)"XdgDesktopFile::value(QString const&, QVariant const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::isShow(QString const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::isShown(QString const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::isValid() const@Base" 1.0.0
 (c++)"XdgDesktopFile::contains(QString const&) const@Base" 1.0.0
 (c++)"XdgDesktopFile::fileName() const@Base" 1.0.0
 (c++)"XdgDesktopFile::iconName() const@Base" 1.0.0
 (c++)"XdgDesktopFile::operator==(XdgDesktopFile const&) const@Base" 1.0.0
 (c++)"QtXdg::QIconLoader::findIconHelper(QString const&, QString const&, QStringList&) const@Base" 1.0.0
 (c++)"QtXdg::QIconLoader::themeSearchPaths() const@Base" 1.0.0
 (c++)"QtXdg::QIconLoader::loadIcon(QString const&) const@Base" 1.0.0
 (c++)"XdgMenu::isOutDated() const@Base" 1.0.0
 (c++)"XdgMenu::metaObject() const@Base" 1.0.0
 (c++)"XdgMenu::errorString() const@Base" 1.0.0
 (c++)"XdgMenu::menuFileName() const@Base" 1.0.0
 (c++)"XdgMenu::xml() const@Base" 1.0.0
 (c++)"XdgMenu::logDir() const@Base" 1.0.0
 (c++)"XdgAction::metaObject() const@Base" 1.0.0
 (c++)"XdgAction::runConmmand() const@Base" 1.0.0
 (c++)"XdgAction::isValid() const@Base" 1.0.0
 (c++)"typeinfo for XdgMenuWidget@Base" 1.0.0
 (c++)"typeinfo for XdgDesktopFile@Base" 1.0.0
 (c++)"typeinfo for XdgIcon@Base" 1.0.0
 (c++)"typeinfo for XdgMenu@Base" 1.0.0
- (c++)"typeinfo for XdgAction@Base" 1.0.0
+ (c++)"typeinfo for XdgMenuWidget@Base" 1.0.0
- (c++)"typeinfo name for XdgMenuWidget@Base" 1.0.0
+ (c++)"typeinfo name for XdgAction@Base" 1.0.0
 (c++)"typeinfo name for XdgDesktopFile@Base" 1.0.0
 (c++)"typeinfo name for XdgIcon@Base" 1.0.0
 (c++)"typeinfo name for XdgMenu@Base" 1.0.0
- (c++)"typeinfo name for XdgAction@Base" 1.0.0
+ (c++)"typeinfo name for XdgMenuWidget@Base" 1.0.0
- (c++)"vtable for XdgMenuWidget@Base" 1.0.0
+ (c++)"vtable for XdgAction@Base" 1.0.0
 (c++)"vtable for XdgDesktopFile@Base" 1.0.0
 (c++)"vtable for XdgIcon@Base" 1.0.0
 (c++)"vtable for XdgMenu@Base" 1.0.0
- (c++)"vtable for XdgAction@Base" 1.0.0
+ (c++)"vtable for XdgMenuWidget@Base" 1.0.0
 (c++)"non-virtual thunk to XdgMenuWidget::~XdgMenuWidget()@Base" 1.0.0
--- a/debian/libqt5xdgiconloader-dev.install
+++ b/debian/libqt5xdgiconloader-dev.install
@ -0,0 +1,9 @@
 usr/include/qt5xdgiconloader
 usr/lib/*/libQt5XdgIconLoader.so
 usr/lib/*/pkgconfig/Qt5XdgIconLoader.pc
 usr/share/cmake/qt5xdgiconloader/qt5xdgiconloader-config-version.cmake
 usr/share/cmake/qt5xdgiconloader/qt5xdgiconloader-config.cmake
 usr/share/cmake/qt5xdgiconloader/qt5xdgiconloader-targets.cmake
 usr/share/cmake/qt5xdgiconloader/qt5xdgiconloader-targets-relwithdebinfo.cmake
--- a/debian/libqt5xdgiconloader2.install
+++ b/debian/libqt5xdgiconloader2.install
@ -0,0 +1,2 @@
 usr/lib/*/libQt5XdgIconLoader.so.*
--- a/debian/libqt5xdgiconloader2.symbols
+++ b/debian/libqt5xdgiconloader2.symbols
@ -0,0 +1,27 @@
 libQt5XdgIconLoader.so.2 libqt5xdgiconloader2 #MINVER#
 (c++)"XdgIconLoader::XdgIconLoader()@Base" 2.0.0
 (c++)"XdgIconLoader::ensureInitialized()@Base" 2.0.0
 (c++)"XdgIconLoader::findIconHelper(QString const&, QString const&, QStringList&) const@Base" 2.0.0
 (c++)"XdgIconLoader::instance()@Base" 2.0.0
 (c++)"XdgIconLoader::loadIcon(QString const&) const@Base" 2.0.0
 (c++)"XdgIconLoader::setThemeName(QString const&)@Base" 2.0.0
 (c++)"XdgIconLoader::setThemeSearchPath(QStringList const&)@Base" 2.0.0
 (c++)"XdgIconLoader::themeSearchPaths() const@Base" 2.0.0
 (c++)"XdgIconLoader::updateSystemTheme()@Base" 2.0.0
 (c++)"XdgIconLoaderEngine::XdgIconLoaderEngine(QString const&)@Base" 2.0.0
 (c++)"XdgIconLoaderEngine::XdgIconLoaderEngine(XdgIconLoaderEngine const&)@Base" 2.0.0
 (c++)"XdgIconLoaderEngine::actualSize(QSize const&, QIcon::Mode, QIcon::State)@Base" 2.0.0
 (c++)"XdgIconLoaderEngine::clone() const@Base" 2.0.0
 (c++)"XdgIconLoaderEngine::ensureLoaded()@Base" 2.0.0
 (c++)"XdgIconLoaderEngine::entryForSize(QSize const&)@Base" 2.0.0
 (c++)"XdgIconLoaderEngine::hasIcon() const@Base" 2.0.0
 (c++)"XdgIconLoaderEngine::key() const@Base" 2.0.0
 (c++)"XdgIconLoaderEngine::paint(QPainter*, QRect const&, QIcon::Mode, QIcon::State)@Base" 2.0.0
 (c++)"XdgIconLoaderEngine::pixmap(QSize const&, QIcon::Mode, QIcon::State)@Base" 2.0.0
 (c++)"XdgIconLoaderEngine::read(QDataStream&)@Base" 2.0.0
 (c++)"XdgIconLoaderEngine::virtual_hook(int, void*)@Base" 2.0.0
 (c++)"XdgIconLoaderEngine::write(QDataStream&) const@Base" 2.0.0
 (c++)"XdgIconLoaderEngine::~XdgIconLoaderEngine()@Base" 2.0.0
 (c++)"typeinfo for XdgIconLoaderEngine@Base" 2.0.0
 (c++)"typeinfo name for XdgIconLoaderEngine@Base" 2.0.0
 (c++)"vtable for XdgIconLoaderEngine@Base" 2.0.0
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@ -1,63 +1,50 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v2.0.22 (GNU/Linux)
-mQINBFJevCYBEACx+Hvy+Vsuf+V5jeLUnzjAmHoy8DfTeGWr3ts30IapLHrfi0+U
+mQINBFXQeMMBEACif4+9pTrC6uNmRng0ZbzLh7p3cazmbnp2YFgDQDJZ7ZNmebxy
-WpzNnISO77yTr4VNboVZH+GHM/rnPfieODfB4ZW6CZLlInMSKUXcgQsEqXpyBZhA
+ngRuRhjGuDcFAL/37BwJnrBpfZFK9ljoH4Fo5Jm9cOELaTy7AIcEiV9dKMyrKF1E
-Ib/SPy2bOfHly1uRJes0uRDsH5+v/hD74sByfnjQlrvI68O6wvGZmDFMNNPVO8+/
+C76d8jHVuzuPbI92DkFdLZAdk+qjrrAy0x43PvUd+aaBGLcFs1ZMk7gOvElc2d95
-OWBSBNkBuVrrZOMSPsLwQGJ4UtUQ4whburaPJG4VZJc5DLbzJGbEuACc0IAEYJS3
+zWWSp5anjukmGbp+EsStnWJkF6VHj56qmklfYy5ioiVBOSpXo/RsACAcIlz8C8A1
-7AfXVXn4j4Gc9F3o1xTUnbOBnwGPquWwUIm3FM7Ec2OdkvMt3EwvnkMAfeVrq3iE
+d4tNMiB2uF2OrUfrL8DD6m3nBqep+AYbIQrxMl9kUQH3I33e9kH/L+SHQyE6phS8
-FDD/KZTxdL0BZH3QD8gB7Jm4v4f3Nkobg6JCvCbcH3wBdZW4mASbwWzfRaDC2zHb
+Czq06WjV4TcJ9VWxm7hQCNLYSxhZYYr1AW45lS5+xmfBOq2qeLgvjbFxa8PPrsp6
-ErTglD7PpShLKZZ0pr9okWZEGw4Ku3q8ALi1JXK/ePTmsBlvkVskOJ3Nnd0avgH4
+Bqgt8MjwUkXjU5IB7YulUBvFU2l0MJZWDBuNy0oNtCe1cU3JyIqLKjvzQQQ9eD5L
-+Q/vZoKfH8EhNY745rI+8CE9iv6V9XiSUt4CKEWAENt4A8hq6U2vV+jZv3B6AgD7
+o3Ul704TLHz0z+67Rxh05Mi4JvyFMjnooSJkNH8/7yXoBN0ZGOh1/5zMU1gK5bmP
-ZjiI59yD4YuYubu8rCnNizTgh1voVw3ietknn/x2H5yH8fByWZ5uL87C0ky/uma6
+6hKgis2exSZNIS74mF6/PqGgcwk3PyI4T3keUQoNPj11M2EznLHxY19QZfQ5oMed
-ZGbiiAtM4kdkyDMrfRV5nlEG9EKAGPVu5mjeSCrfkETwZ9OFPz1AuDye4ZEXrrcC
+8xOlHKjpcm8PYMB4gduNXlV7gI9h7UxuC5GuPiP2lmM6wUyHu48divxDk5UYgPEC
-iRQ7RX6/GtW18aHER0kzGnfwx5KJzkDrRBY8A2PdXLBcrsN4WpK9EX01PQARAQAB
+xlPI2wHCNDsuy0EruCYIvrMSZfpYCCSrmXiOORBLO5qXkauILLkJarHqjQARAQAB
-tCNKZXJvbWUgTGVjbGFuY2hlIDxqZXJvbWVAbGVjbGFuLmNoPokCPwQTAQIAKQUC
+tCBBbGYgR2FpZGEgPGFnYWlkYUBzaWR1Y3Rpb24ub3JnPokCOAQTAQIAIgUCVdB4
-Ul68JgIbAwUJAeEzgAcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEDfgrx/a
+wwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQQsnI069epeOT2xAAgSHf
-SPNzSHIP/1ewXcC0TFBcvDD7MrIP7anyNfiWfW7cxkR8GSamkg6HTa6Ndyr1FFjJ
+41103cnElGf6TokPl4J6hdRPy2CUAjmBtMfr8eajYvGDGgnmsh9AGYGURjfFVCCf
-OoDFUP37jWhu59CsHxs2D0zRWJktezfvElscRgqbHcdpIznqsGdI8hXCZafhBGVb
+Ag+8b6nF3xg03UmgsuSO8H78HGv9kKzF9aHmLt+SXq3jUX+LnIkFHErZWjFAKdJr
-sdAB2LRawcXGxnXt7XajPcSVwLWRE62caBqohznU2iWvI780WNjEbZoA0LhZwaFF
+luu1j6ltxLe9PQljxZnugzMaUbW8eEPKvcriiDn3S4/DtikW/jpGA0MTY4ZWs9pZ
-UUPJm8ea9v0IkZVKUyg9WONZ1U7FEG9SaEiSpI8kJdx1fvCwZVDV/NRO5GqnJaho
+L/6iRRH99L2X/cWO4sCgDXCTt4oK0f5OvwiuCoVOM+PYoIm31JICCKOlqamkCn7d
-P1LCne4YdwS6pt1/fRgk32IHxxZfHlLzLHxb6v1JmIg72x28qCmGyK9oFBDbbnYu
+2KH3nsy0v7tXgnrnb/zr8jVGsZLzUE51AFOzb5Ec74/2SAq8X4gbTppttLXEIooq
-6Aq8XbHogOrD5vJM2Pfm2IhV0+JHOjfQbddv8tsAH1M+LI+tToXmg5st1AU3wnTn
+nbepitW/PePkPY5gpfwHtFbl88qFnir+ABMefqRZkzeh0tsxJVLVHGP1KZykXpv7
-pda3hjA1avKwkfBPW/osHc8782ViyS9iX2e9iDtMv608guij4NjpGExzGCypHOd8
+96A6Q1h7Zo9Ny7WwN5Xl02g35LVCaPyzd3A8A4315uMuP3iziq57UktKqh9d5S3t
-+VXRwJDjvgDynkL206MZ+wn0j5wHsIE8F3Y5Bp1thQOrdDli5MYNQoXhjFmH46XT
+jfK7e9UfFQZBLfxn2sNPsjdYSNUQp/PXTTk/599h359WVuUIR866T8K7N7EEon3p
-bcr84IgW0+AiXZdoFUqvwtzrWy2Onuw5R3k4OyV4skN4DkWXyAk/V+Y4K39JvTKf
+qLItZljQ9Nmr/yGwKi9iQgi2LtZj5KUcF1zBLzZKf95FvoqSZqBXdFSjm+eYGaCH
-H9YuiQ9blNzCu8WiAnjKnh9kNl9E/TyEwI6cHFmIPqF8ST9tJytWHtrKvU9csvXX
+Q2IBnhyP92lEknSK9ystUJXmY69tQKBFqJxScwaS+7a/rfLKssQjSWxqk+SX4QeW
-n8XNJmpcv2R1e6N+VuWWm5zUPTouv3AxCacLbm8Lh3ymGsk7ZEyhiQIcBBABAgAG
+e9z9FUpo71bq0Zkc/M9aOCoEEmhg4Ob/JWy08oC5Ag0EVdB4wwEQAKZDCc/C41y0
-BQJSsFYyAAoJEBMY76xfu9vO6v0P/3wSj3/kE4nP4HfgcVJSzi+lm1ycpbLDZtgh
+omLFCAJybvHiFScM+jOpyGpQvceoviEhIT7h1br/pnSEMkgPQEDPWJGtKueg1/94
-P1G+zJLVmA+E41vEZimeiYQxBAelatJz+CHzQo3LZ2oVChzVrZcVHn9k4P3pib69
+sXTH24uefr3Y6JdZoBtprxl4JXUoOndgq1QH1xuUsy3/9YWU8Qboy9j8a8w0oCDE
-qCVif3/y0Wmecn+u2TWbOvJ7mthfO7T3W7rkW1/9ES7bUaXcXWQ2sjUBVqFkFsVt
+T8Z03KHCwqzD3K+44jhmhF+0eLoaaY8ohS8ziP+DcFKVHyatmS5yCCdjVrj6PxMp
-xgJDo8wcxA+K4Yf06GCbxFwrB7X5GraWIkzqGnyse3XAQn8aORAXmE8Yd0FHOjEZ
+uy/y5SXT1kmiPdVAIzQlM5DlN6o46TV+BH0pPvVYjtwf31o0FckJxy5S1v0koCNB
-Beb9shChnkYc3lEvNY8ioCaYSF9xr/Iz9cwpfPkpqFiVYWadtb+Gqeh6zC7vPmcT
+vX2b7tTDPKzn8G18eUVhGoUTZBUCp1gg36wJ0YY4xgZ9vI/xDCeHeAkyvGtaTAoy
-zHxrgkq1WwQlSBm724tPt9xuGQoOglqEa23vlQZfv20nyrYjLeYUy6pMCRq7vn/n
+qP4rHoUO5KVRSDh7frSlrdbLGWHaQwOhcqoKd4qP/164wHPGkgHL1vztdOc7l1wx
-nkQOcXF7yQlnqR6xKk0tWsM4e6du0ZvbjBbhHV/kBFVGCLm/upTwoMVm0WJTbr4T
+q3gMh2uwmJR0NRrw4WVuaIqL9lEbGBNijlmGsuqXfsMRhc/qoqgVDWvrcCtEoOwl
-5XfIZo7eA0lvGtUhe1PgcOidBikHfAIfYxu0BoMXoL4jbcQdR5+YBDEfsS0jPhCl
+TONGobW3jpCCjpa9SeGNjxuY6IVLn0lfX4hItNVY9sFA+H+yj4uBQ7zsmMUXafxt
-mew2ScW/R/UhUknJUVFTma0KHXzEmKiqeeUCDtwEi6fxdicAYkbcekgkfFiD/w8N
+Yllm0f98yGNg5lnJg4bLOYu3IkpogUKNA3qkZ+6vRtwH70/bJGp7qdx/3G4W5dMX
-Lk3Uf+0x2MdKA36nUobFkk38oU+GW37kFWJs3f1YRuQFao896eNW/E8ekVMLNxOl
+asd/rJjdELW+R/NVULAmK1ETSklaa3Z6vbTu8bN8gvP8pmMJ8f/U8+qzkuAqc201
-nCjnSbabaxDnxPTyW2KlNjf/QUEK4pT6S5QmuCSrle3PQpaSbAZDHzLBIL9gd3m6
+Z4O+s7ZsQfTiz5mm7zPGIYTnppDSno/rABEBAAGJAh8EGAECAAkFAlXQeMMCGwwA
-MH7+SvV4uQINBFJevCYBEADiXDUqstSdhIyuionS2KtE3IeEBIqS7GY8QPRBylIZ
+CgkQQsnI069epeMt0g/+JrwLhULD6NOxaLgxboh/KZkh/7ViU4cB+QPT8JIcWxkZ
-ACVHFI/1HxChBqYVGFaDEQn3gj5lUUQPubfWaxzjF6+UNVQW4+cxmTocndAwfDbI
+zj8uk85TUitEUzKmjp/ItCrhQE5WNNWbz/FBnAuLtaQuHhcHMA3Vu95UUCGi1vyZ
-+E5BLdieFUzbAA05MV5ZjPhTNbSk1jpy4bNy0FILwNqc89Y6SoCbv1r3tZLCrBas
+ZRlS3YRM6S9BOzrjG7fGQJmO/RU3g6rb0TAwGFxDHj8t4JEDTc3zASG7wV/VTn06
-1+AfWknBynx0siGMbLFxtzR6hUkNz9URxt13FrzpUWMpAL8ZQGczOTSaWLrZA5l9
+d8XIH9CZOw3kUuhkQ3OR/PEj1BCeCC+caC+tBjO0fgvDp8RV7NFQQ9kH8R3/xlWd
-xLzJ9ww8uM+C2Xej3/sANxi+kQE2GVMKurPS0TICwVWZxbdW/ytIkO67Rhse0q3t
+6KMPtILE6fUft6LubWRGd1P5JBuzXivELolASajewbYtL/s87CCji3ngq0aT9raK
-vzjdawfCFRxv7XQB2ZJ6irDxbpHiJoojSWCHJadIyCG03iOiaqsSVvi4KnxtUck+
+m02wqFzNbX1iv+w2iqPQXq6pdRyxtJ8+Q8Z7zEBGJS5nkrYjsLTduZIjJHYHYH7f
-udOEJUV5sxdzgeRrsDpeaN//KCWW9WjfsSkvOqP6S1gmWpNFdzF5XrzcgvqvSNqo
+3/ydVjQ3z12iqHKElgaRI7RUmpNiNxVIr+TtuxzeC6G+CF++XNkUtJODvCmRaoJS
-XejfakUTJqsIIEHO0zGuJFVzJNh2hQ/9dhjIspUORhtNKaljNvePiBrj2yqmd9PY
+waYsitz8+LSv3tawZJ0iQkKc9nerQMuBD+AzIr3i4NgXiEIN513esUtnKzeyIIsL
-FlH1KMHe4H+YVIwPiyeNA87Pu+1yNo8gT7mXhGRfibgWjbt146WUJ7+l2StJMApn
+ntUcBjXKuLCj8OZrZtexjq7edWWbN57/3ikyS2Z7y0i3O30qk5jmccSaS6kA7xTY
-eNSCartNaUNPnw96i2l5c9AsJ3SWC6XWpWzOLVj+9XceeA11lu/ogqEMHzx81NjH
+WCDFzbN2v2y+vGu9KYn+2HtrP2BtNa8JTh3waNeLUTpn4GV4mMrsZjOy6vhhHb91
-2TePxwKTKxZnAvDmqryp++IgY2/OgIoIk3ZRdYu/dPijTOYWfCet/9/9kAFr9PeJ
+1TKfI1gvjk7lE9xaWmcDjdI55dw3jIq8kK9SdgORGq9/S3g7KJNRjme+6GjqQfk=
-KwARAQABiQIlBBgBAgAPBQJSXrwmAhsMBQkB4TOAAAoJEDfgrx/aSPNzJv0QAKkx
+=h7ww
 lCKEZ6ahAUuNWslsHnNWaHFHNawEO3NIEtQZGVFk2BYISupizvjZF6MnymO/9UFM
 pzV6fp3xNdqaKWQBjScOgMgCASRixW2tMAKbJGHZKp3dBixpHgXxy2oOGMS+mQ5m
 gWy07usq2YesoMD0K/SG6EnoRPHBvrJihArzMFVUY9hD3hk8bhiy8w9bCYFe+gkm
 zpQl3/KN01kyt5LjzEBcIOw8qIBQe9Pk8PyOK75lPoNME714LatgOsyw2kaSQ9Sv
 hziRGC5z/fV3PmH7XhSjENPKnCJU51GUMMLaL28t9o7Afh6Q8UV31/JO36vmQXQV
 +b+0BoGqEmf3AKBASb2Cr2q4pZFjywwSUXHZ9hQyu1tpbE1dS6aI01kM0y270pk7
 W/ajuzuOxAVL1bJAanL/5+DWM03esZPVdEWhxpWEM40Z6Rhq+Xb2a5xfwCN9PmaQ
 o9fez0I+yh53s7Ypv0tBj05FPe5L48+pDi6pz5nddN1B0FzF58jVfsBZUjBlY24+
 VwQeAaWkRXZrSEdtBS5ufsi80x/cNCSTJBWqtborKL1iGgf5MDPYRMSvmZXAeIld
 pyL/0pbW7iokewyKzpFfo7KEbwLxB+flWaBZ867JpF4yyRj3b4qcvcyV8QnsoB7Z
 KhxTl3gGwD/t0HUcu85zcfs4GkealYhIWfGaAso2
 =fF8P
 -----END PGP PUBLIC KEY BLOCK-----
--- a/debian/watch
+++ b/debian/watch
@ -1,3 +1,3 @@
-version=3
+version=4
 opts="pgpsigurlmangle=s/$/.asc/" \
    https://github.com/lxde/libqtxdg/releases .*/libqtxdg-([\d\.]+)\.tar\.xz
--- a/qtxdg/CMakeLists.txt
+++ b/qtxdg/CMakeLists.txt
@ -0,0 +1,146 @@
 set(QTX_LIBRARIES Qt5::Widgets Qt5::Xml Qt5::DBus)
 include_directories(
    "${Qt5Gui_PRIVATE_INCLUDE_DIRS}"
 )
 set(libqtxdg_PUBLIC_H_FILES
    xdgaction.h
    xdgdesktopfile.h
    xdgdirs.h
    xdgicon.h
    xdgmenu.h
    xdgmenuwidget.h
    xmlhelper.h
    xdgautostart.h
    xdgmacros.h
    xdgmimetype.h
 )
 set(libqtxdg_PUBLIC_CLASSES
    XdgAction
    XdgDesktopFile
    XdgDirs
    XdgIcon
    XdgMenu
    XdgMenuWidget
    XmlHelper
    XdgAutoStart
    XdgMimeType
 )
 set(libqtxdg_PRIVATE_H_FILES
    xdgmenuapplinkprocessor.h
    xdgmenulayoutprocessor.h
    xdgmenu_p.h
    xdgmenureader.h
    xdgmenurules.h
    xdgdesktopfile_p.h
 )
 set(libqtxdg_CPP_FILES
    xdgaction.cpp
    xdgdesktopfile.cpp
    xdgdirs.cpp
    xdgicon.cpp
    xdgmenuapplinkprocessor.cpp
    xdgmenu.cpp
    xdgmenulayoutprocessor.cpp
    xdgmenureader.cpp
    xdgmenurules.cpp
    xdgmenuwidget.cpp
    xmlhelper.cpp
    xdgautostart.cpp
    xdgmimetype.cpp
 )
 set(libqtxdg_MOCS
    xdgaction.h
    xdgmenuapplinkprocessor.h
    xdgmenu.h
    xdgmenu_p.h
    xdgmenureader.h
    xdgmenurules.h
    xdgmenuwidget.h
 )
 QT5_WRAP_CPP(libqtxdg_CXX_FILES ${libqtxdg_MOCS})
 add_library(${QTXDGX_LIBRARY_NAME} SHARED
    ${libqtxdg_PUBLIC_H_FILES}
    ${libqtxdg_PRIVATE_H_FILES}
    ${libqtxdg_PRIVATE_H_FILES}
    ${libqtxdg_CPP_FILES}
    ${libqtxdg_CXX_FILES}
 )
 target_link_libraries(${QTXDGX_LIBRARY_NAME}
    PUBLIC
        ${QTX_LIBRARIES}
        ${QTXDGX_ICONLOADER_LIBRARY_NAME}
 )
 set_target_properties(${QTXDGX_LIBRARY_NAME} PROPERTIES
  VERSION ${QTXDG_VERSION_STRING}
  SOVERSION ${QTXDG_MAJOR_VERSION}
 )
 target_compile_definitions(${QTXDGX_LIBRARY_NAME}
    PRIVATE "QTXDG_COMPILATION=\"1\""
    PRIVATE "QTXDG_VERSION=\"${QTXDG_VERSION_STRING}\""
 )
 target_include_directories(${QTXDGX_LIBRARY_NAME}
    INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_FILE_NAME}>"
    INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
 )
 # include directories and targets for the in tree build
 target_include_directories(${QTXDGX_LIBRARY_NAME}
    INTERFACE "$<BUILD_INTERFACE:${QTXDGX_INTREE_INCLUDEDIR}/${QTXDGX_FILE_NAME}>"
    INTERFACE "$<BUILD_INTERFACE:${QTXDGX_INTREE_INCLUDEDIR}>"
 )
 export(TARGETS ${QTXDGX_LIBRARY_NAME} APPEND FILE "${CMAKE_BINARY_DIR}/${QTXDGX_FILE_NAME}-targets.cmake")
 # end of in tree build stuff
 # create the portble headers
 create_portable_headers(libqtxdg_PORTABLE_HEADERS
    HEADER_NAMES ${libqtxdg_PUBLIC_CLASSES}
    OUTPUT_DIR "${QTXDGX_INTREE_INCLUDEDIR}/${QTXDGX_FILE_NAME}"
 )
 # Copy public headers (in tree building)
 foreach(h ${libqtxdg_PUBLIC_H_FILES})
    get_filename_component(bh ${h} NAME)
    configure_file(${h} "${QTXDGX_INTREE_INCLUDEDIR}/${QTXDGX_FILE_NAME}/${bh}" COPYONLY)
 endforeach()
 # Copy private headers (in tree building)
 foreach(h ${libqtxdg_PRIVATE_INSTALLABLE_H_FILES})
    get_filename_component(bh ${h} NAME)
    configure_file(${h} "${QTXDGX_INTREE_INCLUDEDIR}/${QTXDGX_FILE_NAME}/${QTXDG_VERSION_STRING}/private/qtxdg/${bh}" COPYONLY)
 endforeach()
 install(TARGETS
    ${QTXDGX_LIBRARY_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}"
    EXPORT "${QTXDGX_FILE_NAME}-targets"
    COMPONENT Runtime
 )
 install(FILES
    ${libqtxdg_PUBLIC_H_FILES}
    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_FILE_NAME}"
    COMPONENT Devel
 )
 install(FILES
    ${libqtxdg_PRIVATE_INSTALLABLE_H_FILES}
    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_FILE_NAME}/${QTXDG_VERSION_STRING}/private/qtxdg"
    COMPONENT Devel
 )
 install(FILES
    ${libqtxdg_PORTABLE_HEADERS}
    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_FILE_NAME}"
    COMPONENT Devel
 )
--- a/qtxdg/desktopenvironment_p.cpp
+++ b/qtxdg/desktopenvironment_p.cpp
--- a/qtxdg/xdgaction.cpp
+++ b/qtxdg/xdgaction.cpp
@ -91,7 +91,7 @@ void XdgAction::load(const XdgDesktopFile& desktopFile)
    if (mDesktopFile.isValid())
    {
        // & is reserved for mnemonics
-        setText(mDesktopFile.name().replace('&', QLatin1String("&&")));
+        setText(mDesktopFile.name().replace(QLatin1Char('&'), QLatin1String("&&")));
        setToolTip(mDesktopFile.comment());
        connect(this, SIGNAL(triggered()), this, SLOT(runConmmand()));
@ -117,6 +117,6 @@ void XdgAction::updateIcon()
 {
    setIcon(mDesktopFile.icon());
    if (icon().isNull())
-        setIcon(XdgIcon::fromTheme("application-x-executable"));
+        setIcon(XdgIcon::fromTheme(QLatin1String("application-x-executable")));
    QCoreApplication::processEvents();
 }
--- a/qtxdg/xdgaction.h
+++ b/qtxdg/xdgaction.h
--- a/qtxdg/xdgautostart.cpp
+++ b/qtxdg/xdgautostart.cpp
@ -57,14 +57,14 @@ XdgDesktopFileList XdgAutoStart::desktopFileList(QStringList dirs, bool excludeH
    QSet<QString> processed;
    XdgDesktopFileList ret;
-    foreach (QString dirName, dirs)
+    foreach (const QString &dirName, dirs)
    {
        QDir dir(dirName);
        if (!dir.exists())
            continue;
-        QFileInfoList files = dir.entryInfoList(QStringList("*.desktop"), QDir::Files | QDir::Readable);
+        const QFileInfoList files = dir.entryInfoList(QStringList(QLatin1String("*.desktop")), QDir::Files | QDir::Readable);
-        foreach (QFileInfo fi, files)
+        foreach (const QFileInfo &fi, files)
        {
            if (processed.contains(fi.fileName()))
                continue;
@ -88,5 +88,5 @@ XdgDesktopFileList XdgAutoStart::desktopFileList(QStringList dirs, bool excludeH
 QString XdgAutoStart::localPath(const XdgDesktopFile& file)
 {
    QFileInfo fi(file.fileName());
-    return QString("%1/%2").arg(XdgDirs::autostartHome(), fi.fileName());
+    return QString::fromLatin1("%1/%2").arg(XdgDirs::autostartHome(), fi.fileName());
 }
--- a/qtxdg/xdgautostart.h
+++ b/qtxdg/xdgautostart.h
--- a/qtxdg/xdgdesktopfile.cpp
+++ b/qtxdg/xdgdesktopfile.cpp
--- a/qtxdg/xdgdesktopfile.h
+++ b/qtxdg/xdgdesktopfile.h
@ -79,7 +79,7 @@ public:
        - ApplicationType, "value" should be the Exec value;
        - LinkType, "value" should be the URL;
        - DirectoryType, "value" should be omitted */
-    XdgDesktopFile(XdgDesktopFile::Type type, const QString& name, const QString& value = 0);
+    XdgDesktopFile(XdgDesktopFile::Type type, const QString& name, const QString& value = QString());
    //! Destroys the object.
    virtual ~XdgDesktopFile();
@ -146,11 +146,18 @@ public:
    //! Returns an icon name specified in this file.
    QString const iconName() const;
    //! Returns an list of mimetypes specified in this file.
    /*! @return  Returns a list of the "MimeType=" entries.
     *  If the file doens't contain the MimeType entry, an empty QStringList is
     *  returned. Empty values are removed from the returned list.
     */
    QStringList mimeTypes() const;
    //! This function is provided for convenience. It's equivalent to calling localizedValue("Name").toString().
-    QString name() const { return localizedValue("Name").toString(); }
+    QString name() const { return localizedValue(QLatin1String("Name")).toString(); }
    //! This function is provided for convenience. It's equivalent to calling localizedValue("Comment").toString().
-    QString comment() const { return localizedValue("Comment").toString(); }
+    QString comment() const { return localizedValue(QLatin1String("Comment")).toString(); }
    /*! Returns the desktop file type.
        @see XdgDesktopFile::Type */
@ -177,9 +184,16 @@ public:
    /*! Returns the URL for the Link desktop file; otherwise an empty string is returned.  */
    QString url() const;
-    /*! The desktop entry specification defines a number of fields to control the visibility of the application menu. This function
+    /*! Computes the desktop file ID. It is the identifier of an installed
-         checks whether to display a this application or not. */
+     *  desktop entry file.
-    QTXDG_DEPRECATED bool isShow(const QString& environment = "Razor") const;
+     * @par fileName - The desktop file complete name.
     * @par checkFileExists If true and the file doesn't exist the computed ID
     * will be an empty QString(). Defaults to true.
     * @return The computed ID. Returns an empty QString() if it's impossible to
     * compute the ID. Reference:
     * https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#desktop-file-id
     */
    static QString id(const QString &fileName, bool checkFileExists = true);
    /*! The desktop entry specification defines a number of fields to control
        the visibility of the application menu. Thisfunction checks whether
@ -192,12 +206,6 @@ public:
    */
    bool isShown(const QString &environment = QString()) const;
    /*! This fuction returns true if the desktop file is applicable to the current environment.
        @par excludeHidden - if set to true (default), files with "Hidden=true" will be considered "not applicable".
                             Setting this to false is be useful when the user wants to enable/disable items and wants to see those
                             that are Hidden */
    QTXDG_DEPRECATED bool isApplicable(bool excludeHidden = true, const QString& environment = "Razor") const;
    /*! This fuction returns true if the desktop file is applicable to the
        current environment.
        @par excludeHidden - if set to true (default), files with
@ -213,7 +221,7 @@ public:
    bool isSuitable(bool excludeHidden = true, const QString &environment = QString()) const;
 protected:
-    virtual QString prefix() const { return "Desktop Entry"; }
+    virtual QString prefix() const { return QLatin1String("Desktop Entry"); }
    virtual bool check() const { return true; }
 private:
    /*! Returns the localized version of the key if the Desktop File already contains a localized version of it.
@ -261,5 +269,3 @@ private:
 #endif // QTXDG_XDGDESKTOPFILE_H
--- a/qtxdg/xdgdesktopfile_p.h
+++ b/qtxdg/xdgdesktopfile_p.h
--- a/qtxdg/xdgdirs.cpp
+++ b/qtxdg/xdgdirs.cpp
@ -28,21 +28,20 @@
 #include "xdgdirs.h"
 #include <stdlib.h>
 #include <QDir>
 #include <QStringBuilder> // for the % operator
 #include <QDebug>
 #include <QStandardPaths>
 static const QString userDirectoryString[8] =
 {
-    "Desktop",
+    QLatin1String("Desktop"),
-    "Download",
+    QLatin1String("Download"),
-    "Templates",
+    QLatin1String("Templates"),
-    "Publicshare",
+    QLatin1String("Publicshare"),
-    "Documents",
+    QLatin1String("Documents"),
-    "Music",
+    QLatin1String("Music"),
-    "Pictures",
+    QLatin1String("Pictures"),
-    "Videos"
+    QLatin1String("Videos")
 };
 // Helper functions prototypes
@ -51,7 +50,7 @@ void removeEndingSlash(QString &s);
 QString createDirectory(const QString &dir);
 void cleanAndAddPostfix(QStringList &dirs, const QString& postfix);
-
+QString userDirFallback(XdgDirs::UserDirectory dir);
 /************************************************
 Helper func.
@ -59,7 +58,7 @@ void cleanAndAddPostfix(QStringList &dirs, const QString& postfix);
 void fixBashShortcuts(QString &s)
 {
    if (s.startsWith(QLatin1Char('~')))
-        s = QString(getenv("HOME")) + (s).mid(1);
+        s = QFile::decodeName(qgetenv("HOME")) + (s).mid(1);
 }
@ -78,9 +77,9 @@ QString createDirectory(const QString &dir)
    QDir d(dir);
    if (!d.exists())
    {
-        if (!d.mkpath("."))
+        if (!d.mkpath(QLatin1String(".")))
        {
-            qWarning() << QString("Can't create %1 directory.").arg(d.absolutePath());
+            qWarning() << QString::fromLatin1("Can't create %1 directory.").arg(d.absolutePath());
        }
    }
    QString r = d.absolutePath();
@ -101,31 +100,53 @@ void cleanAndAddPostfix(QStringList &dirs, const QString& postfix)
 }
 QString userDirFallback(XdgDirs::UserDirectory dir)
 {
    QString fallback;
    const QString home = QFile::decodeName(qgetenv("HOME"));
    if (home.isEmpty())
        return QString::fromLatin1("/tmp");
    else if (dir == XdgDirs::Desktop)
        fallback = QString::fromLatin1("%1/%2").arg(home).arg(QLatin1String("Desktop"));
    else
        fallback = home;
    return fallback;
 }
 QString XdgDirs::userDirDefault(XdgDirs::UserDirectory dir)
 {
    // possible values for UserDirectory
    Q_ASSERT(!(dir < XdgDirs::Desktop || dir > XdgDirs::Videos));
    if (dir < XdgDirs::Desktop || dir > XdgDirs::Videos)
        return QString();
    return userDirFallback(dir);
 }
 QString XdgDirs::userDir(XdgDirs::UserDirectory dir)
 {
    // possible values for UserDirectory
-    if (dir < 0 || dir > 7)
+    Q_ASSERT(!(dir < XdgDirs::Desktop || dir > XdgDirs::Videos));
    if (dir < XdgDirs::Desktop || dir > XdgDirs::Videos)
        return QString();
    QString folderName = userDirectoryString[dir];
-    QString fallback;
+    const QString fallback = userDirFallback(dir);
    if (getenv("HOME") == NULL)
        return QString("/tmp");
    else if (dir == XdgDirs::Desktop)
        fallback = QString("%1/%2").arg(getenv("HOME")).arg("Desktop");
    else
        fallback = QString(getenv("HOME"));
    QString configDir(configHome());
-    QFile configFile(configDir + "/user-dirs.dirs");
+    QFile configFile(configDir + QLatin1String("/user-dirs.dirs"));
    if (!configFile.exists())
        return fallback;
    if (!configFile.open(QIODevice::ReadOnly | QIODevice::Text))
        return fallback;
-    QString userDirVar("XDG_" + folderName.toUpper() + "_DIR");
+    QString userDirVar(QLatin1String("XDG_") + folderName.toUpper() + QLatin1String("_DIR"));
    QTextStream in(&configFile);
    QString line;
    while (!in.atEnd())
@ -137,6 +158,8 @@ QString XdgDirs::userDir(XdgDirs::UserDirectory dir)
            // get path between quotes
            line = line.section(QLatin1Char('"'), 1, 1);
            if (line.isEmpty())
                return fallback;
            line.replace(QLatin1String("$HOME"), QLatin1String("~"));
            fixBashShortcuts(line);
            return line;
@ -151,18 +174,19 @@ QString XdgDirs::userDir(XdgDirs::UserDirectory dir)
 bool XdgDirs::setUserDir(XdgDirs::UserDirectory dir, const QString& value, bool createDir)
 {
    // possible values for UserDirectory
-    if (dir < 0 || dir > 7)
+    Q_ASSERT(!(dir < XdgDirs::Desktop || dir > XdgDirs::Videos));
    if (dir < XdgDirs::Desktop || dir > XdgDirs::Videos)
        return false;
    if (!(value.startsWith(QLatin1String("$HOME"))
                           || value.startsWith(QLatin1String("~/"))
-                           || value.startsWith(QString(getenv("HOME")))))
+                           || value.startsWith(QFile::decodeName(qgetenv("HOME")))))
        return false;
    QString folderName = userDirectoryString[dir];
    QString configDir(configHome());
-    QFile configFile(configDir % QLatin1String("/user-dirs.dirs"));
+    QFile configFile(configDir + QLatin1String("/user-dirs.dirs"));
    // create the file if doesn't exist and opens it
    if (!configFile.open(QIODevice::ReadWrite | QIODevice::Text))
@ -191,10 +215,10 @@ bool XdgDirs::setUserDir(XdgDirs::UserDirectory dir, const QString& value, bool
    stream.reset();
    configFile.resize(0);
    if (!foundVar)
-        stream << QString("XDG_%1_DIR=\"%2\"\n").arg(folderName.toUpper()).arg(value);
+        stream << QString::fromLatin1("XDG_%1_DIR=\"%2\"\n").arg(folderName.toUpper()).arg(value);
    for (QVector<QString>::iterator i = lines.begin(); i != lines.end(); ++i)
-        stream << *i << "\n";
+        stream << *i << QLatin1Char('\n');
    configFile.close();
@ -293,7 +317,7 @@ QString XdgDirs::runtimeDir()
 QString XdgDirs::autostartHome(bool createDir)
 {
-    QString s = QString("%1/autostart").arg(configHome(createDir));
+    QString s = QString::fromLatin1("%1/autostart").arg(configHome(createDir));
    fixBashShortcuts(s);
    if (createDir)
@ -309,9 +333,9 @@ QString XdgDirs::autostartHome(bool createDir)
 QStringList XdgDirs::autostartDirs(const QString &postfix)
 {
    QStringList dirs;
-    QStringList s = configDirs();
+    const QStringList s = configDirs();
-    foreach(QString dir, s)
+    foreach(const QString &dir, s)
-        dirs << QString("%1/autostart").arg(dir) + postfix;
+        dirs << QString::fromLatin1("%1/autostart").arg(dir) + postfix;
    return dirs;
 }
--- a/qtxdg/xdgdirs.h
+++ b/qtxdg/xdgdirs.h
@ -62,6 +62,14 @@ public:
     */
    static QString userDir(UserDirectory dir);
    /*! @brief Returns the default path to the user specified directory.
     *  Returns /tmp if no $HOME defined, $HOME/Desktop if dir equals
     *  XdgDirs::Desktop or $HOME othewise. If dir value is invalid, an empty
     *  QString is returned.
     */
    static QString userDirDefault(UserDirectory dir);
    /*! @brief Returns true if writting into configuration file $XDG_CONFIG_HOME/user-dirs.dirs
     * the path in value for the directory in dir is succesfull. Returns false otherwise. If
     * createDir is true, dir will be created if it doesn't exist.
--- a/qtxdg/xdgicon.cpp
+++ b/qtxdg/xdgicon.cpp
@ -33,10 +33,10 @@
 #include <QStringList>
 #include <QFileInfo>
 #include <QCache>
-#include "qiconfix/qiconloader_p.h"
+#include "../xdgiconloader/xdgiconloader_p.h"
 #include <QCoreApplication>
-#define DEFAULT_APP_ICON "application-x-executable"
+static const QLatin1String DEFAULT_APP_ICON("application-x-executable");
 static void qt_cleanup_icon_cache();
 typedef QCache<QString, QIcon> IconCache;
@ -83,7 +83,7 @@ QString XdgIcon::themeName()
 void XdgIcon::setThemeName(const QString& themeName)
 {
    QIcon::setThemeName(themeName);
-    QtXdg::QIconLoader::instance()->updateSystemTheme();
+    XdgIconLoader::instance()->updateSystemTheme();
 }
@ -96,12 +96,12 @@ QIcon XdgIcon::fromTheme(const QString& iconName, const QIcon& fallback)
    if (iconName.isEmpty())
        return fallback;
-    bool isAbsolute = (iconName[0] == '/');
+    bool isAbsolute = (iconName[0] == QLatin1Char('/'));
    QString name = QFileInfo(iconName).fileName();
-    if (name.endsWith(".png", Qt::CaseInsensitive) ||
+    if (name.endsWith(QLatin1String(".png"), Qt::CaseInsensitive) ||
-        name.endsWith(".svg", Qt::CaseInsensitive) ||
+        name.endsWith(QLatin1String(".svg"), Qt::CaseInsensitive) ||
-        name.endsWith(".xpm", Qt::CaseInsensitive))
+        name.endsWith(QLatin1String(".xpm"), Qt::CaseInsensitive))
    {
        name.truncate(name.length() - 4);
    }
@ -113,11 +113,12 @@ QIcon XdgIcon::fromTheme(const QString& iconName, const QIcon& fallback)
    } else {
        QIcon *cachedIcon;
        if (!isAbsolute)
-            cachedIcon = new QIcon(new QtXdg::QIconLoaderEngineFixed(name));
+            cachedIcon = new QIcon(new XdgIconLoaderEngine(name));
        else
            cachedIcon = new QIcon(iconName);
        qtIconCache()->insert(name, cachedIcon);
        icon = *cachedIcon;
        qtIconCache()->insert(name, cachedIcon);
    }
    // Note the qapp check is to allow lazy loading of static icons
@ -136,7 +137,7 @@ QIcon XdgIcon::fromTheme(const QString& iconName, const QIcon& fallback)
 ************************************************/
 QIcon XdgIcon::fromTheme(const QStringList& iconNames, const QIcon& fallback)
 {
-    foreach (QString iconName, iconNames)
+    foreach (const QString &iconName, iconNames)
    {
        QIcon icon = fromTheme(iconName);
        if (!icon.isNull())
--- a/qtxdg/xdgicon.h
+++ b/qtxdg/xdgicon.h
--- a/qtxdg/xdgmacros.h
+++ b/qtxdg/xdgmacros.h
--- a/qtxdg/xdgmenu.cpp
+++ b/qtxdg/xdgmenu.cpp
@ -157,37 +157,37 @@ bool XdgMenu::read(const QString& menuFileName)
    d->mXml = reader.xml();
    QDomElement root = d->mXml.documentElement();
-    d->saveLog("00-reader.xml");
+    d->saveLog(QLatin1String("00-reader.xml"));
    d->simplify(root);
-    d->saveLog("01-simplify.xml");
+    d->saveLog(QLatin1String("01-simplify.xml"));
    d->mergeMenus(root);
-    d->saveLog("02-mergeMenus.xml");
+    d->saveLog(QLatin1String("02-mergeMenus.xml"));
    d->moveMenus(root);
-    d->saveLog("03-moveMenus.xml");
+    d->saveLog(QLatin1String("03-moveMenus.xml"));
    d->mergeMenus(root);
-    d->saveLog("04-mergeMenus.xml");
+    d->saveLog(QLatin1String("04-mergeMenus.xml"));
    d->deleteDeletedMenus(root);
-    d->saveLog("05-deleteDeletedMenus.xml");
+    d->saveLog(QLatin1String("05-deleteDeletedMenus.xml"));
    d->processDirectoryEntries(root, QStringList());
-    d->saveLog("06-processDirectoryEntries.xml");
+    d->saveLog(QLatin1String("06-processDirectoryEntries.xml"));
    d->processApps(root);
-    d->saveLog("07-processApps.xml");
+    d->saveLog(QLatin1String("07-processApps.xml"));
    d->processLayouts(root);
-    d->saveLog("08-processLayouts.xml");
+    d->saveLog(QLatin1String("08-processLayouts.xml"));
    d->deleteEmpty(root);
-    d->saveLog("09-deleteEmpty.xml");
+    d->saveLog(QLatin1String("09-deleteEmpty.xml"));
    d->fixSeparators(root);
-    d->saveLog("10-fixSeparators.xml");
+    d->saveLog(QLatin1String("10-fixSeparators.xml"));
    d->mOutDated = false;
@ -204,7 +204,7 @@ void XdgMenu::save(const QString& fileName)
    QFile file(fileName);
    if (!file.open(QFile::WriteOnly | QFile::Text))
    {
-        qWarning() << QString("Cannot write file %1:\n%2.")
+        qWarning() << QString::fromLatin1("Cannot write file %1:\n%2.")
                .arg(fileName)
                .arg(file.errorString());
        return;
@ -225,7 +225,7 @@ void XdgMenuPrivate::load(const QString& fileName)
    QFile file(fileName);
    if (!file.open(QFile::ReadOnly | QFile::Text))
    {
-        qWarning() << QString("%1 not loading: %2").arg(fileName).arg(file.errorString());
+        qWarning() << QString::fromLatin1("%1 not loading: %2").arg(fileName).arg(file.errorString());
        return;
    }
    mXml.setContent(&file, true);
@ -236,7 +236,7 @@ void XdgMenuPrivate::saveLog(const QString& logFileName)
 {
    Q_Q(XdgMenu);
    if (!mLogDir.isEmpty())
-        q->save(mLogDir + "/" + logFileName);
+        q->save(mLogDir + QLatin1Char('/') + logFileName);
 }
@ -244,13 +244,13 @@ void XdgMenuPrivate::mergeMenus(QDomElement& element)
 {
    QHash<QString, QDomElement> menus;
-    MutableDomElementIterator it(element, "Menu");
+    MutableDomElementIterator it(element, QLatin1String("Menu"));
    it.toFront();
    while(it.hasNext())
    {
        it.next();
-        menus[it.current().attribute("name")] = it.current();
+        menus[it.current().attribute(QLatin1String("name"))] = it.current();
    }
@ -258,7 +258,7 @@ void XdgMenuPrivate::mergeMenus(QDomElement& element)
    while (it.hasPrevious())
    {
        QDomElement src = it.previous();
-        QDomElement dest = menus[src.attribute("name")];
+        QDomElement dest = menus[src.attribute(QLatin1String("name"))];
        if (dest != src)
        {
            prependChilds(src, dest);
@ -267,11 +267,11 @@ void XdgMenuPrivate::mergeMenus(QDomElement& element)
    }
-    QDomElement n = element.firstChildElement("Menu");
+    QDomElement n = element.firstChildElement(QLatin1String("Menu"));
    while (!n.isNull())
    {
        mergeMenus(n);
-        n = n.nextSiblingElement("Menu");
+        n = n.nextSiblingElement(QLatin1String("Menu"));
    }
    it.toFront();
@ -288,46 +288,46 @@ void XdgMenuPrivate::simplify(QDomElement& element)
    {
        QDomElement n = it.next();
-        if (n.tagName() == "Name")
+        if (n.tagName() == QLatin1String("Name"))
        {
            // The <Name> field must not contain the slash character ("/");
            // implementations should discard any name containing a slash.
-            element.setAttribute("name", n.text().remove('/'));
+            element.setAttribute(QLatin1String("name"), n.text().remove(QLatin1Char('/')));
            n.parentNode().removeChild(n);
        }
        // ......................................
-        else if(n.tagName() == "Deleted")
+        else if(n.tagName() == QLatin1String("Deleted"))
        {
-            element.setAttribute("deleted", true);
+            element.setAttribute(QLatin1String("deleted"), true);
            n.parentNode().removeChild(n);
        }
-        else if(n.tagName() == "NotDeleted")
+        else if(n.tagName() == QLatin1String("NotDeleted"))
        {
-            element.setAttribute("deleted", false);
+            element.setAttribute(QLatin1String("deleted"), false);
            n.parentNode().removeChild(n);
        }
        // ......................................
-        else if(n.tagName() == "OnlyUnallocated")
+        else if(n.tagName() == QLatin1String("OnlyUnallocated"))
        {
-            element.setAttribute("onlyUnallocated", true);
+            element.setAttribute(QLatin1String("onlyUnallocated"), true);
            n.parentNode().removeChild(n);
        }
-        else if(n.tagName() == "NotOnlyUnallocated")
+        else if(n.tagName() == QLatin1String(QLatin1String("NotOnlyUnallocated")))
        {
-            element.setAttribute("onlyUnallocated", false);
+            element.setAttribute(QLatin1String("onlyUnallocated"), false);
            n.parentNode().removeChild(n);
        }
        // ......................................
-        else if(n.tagName() == "FileInfo")
+        else if(n.tagName() == QLatin1String("FileInfo"))
        {
            n.parentNode().removeChild(n);
        }
        // ......................................
-        else if(n.tagName() == "Menu")
+        else if(n.tagName() == QLatin1String("Menu"))
        {
            simplify(n);
        }
@ -348,15 +348,15 @@ void XdgMenuPrivate::prependChilds(QDomElement& srcElement, QDomElement& destEle
        destElement.insertBefore(n, destElement.firstChild());
    }
-    if (srcElement.attributes().contains("deleted") &&
+    if (srcElement.attributes().contains(QLatin1String("deleted")) &&
-        !destElement.attributes().contains("deleted")
+        !destElement.attributes().contains(QLatin1String("deleted"))
       )
-        destElement.setAttribute("deleted", srcElement.attribute("deleted"));
+        destElement.setAttribute(QLatin1String("deleted"), srcElement.attribute(QLatin1String("deleted")));
-    if (srcElement.attributes().contains("onlyUnallocated") &&
+    if (srcElement.attributes().contains(QLatin1String("onlyUnallocated")) &&
-        !destElement.attributes().contains("onlyUnallocated")
+        !destElement.attributes().contains(QLatin1String("onlyUnallocated"))
       )
-        destElement.setAttribute("onlyUnallocated", srcElement.attribute("onlyUnallocated"));
+        destElement.setAttribute(QLatin1String("onlyUnallocated"), srcElement.attribute(QLatin1String("onlyUnallocated")));
 }
@ -367,11 +367,11 @@ void XdgMenuPrivate::appendChilds(QDomElement& srcElement, QDomElement& destElem
    while(it.hasNext())
        destElement.appendChild(it.next());
-    if (srcElement.attributes().contains("deleted"))
+    if (srcElement.attributes().contains(QLatin1String("deleted")))
-        destElement.setAttribute("deleted", srcElement.attribute("deleted"));
+        destElement.setAttribute(QLatin1String("deleted"), srcElement.attribute(QLatin1String("deleted")));
-    if (srcElement.attributes().contains("onlyUnallocated"))
+    if (srcElement.attributes().contains(QLatin1String("onlyUnallocated")))
-        destElement.setAttribute("onlyUnallocated", srcElement.attribute("onlyUnallocated"));
+        destElement.setAttribute(QLatin1String("onlyUnallocated"), srcElement.attribute(QLatin1String("onlyUnallocated")));
 }
@ -384,10 +384,10 @@ QDomElement XdgMenu::findMenu(QDomElement& baseElement, const QString& path, boo
 {
    Q_D(XdgMenu);
    // Absolute path ..................
-    if (path.startsWith('/'))
+    if (path.startsWith(QLatin1Char('/')))
    {
        QDomElement root = d->mXml.documentElement();
-        return findMenu(root, path.section('/', 2), createNonExisting);
+        return findMenu(root, path.section(QLatin1Char('/'), 2), createNonExisting);
    }
    // Relative path ..................
@ -395,13 +395,13 @@ QDomElement XdgMenu::findMenu(QDomElement& baseElement, const QString& path, boo
        return baseElement;
-    QString name = path.section('/', 0, 0);
+    QString name = path.section(QLatin1Char('/'), 0, 0);
    MutableDomElementIterator it(baseElement);
    while(it.hasNext())
    {
        QDomElement n = it.next();
-        if (n.attribute("name") == name)
+        if (n.attribute(QLatin1String("name")) == name)
-            return findMenu(n, path.section('/', 1), createNonExisting);
+            return findMenu(n, path.section(QLatin1Char('/'), 1), createNonExisting);
    }
@ -411,14 +411,14 @@ QDomElement XdgMenu::findMenu(QDomElement& baseElement, const QString& path, boo
        return QDomElement();
-    QStringList names = path.split('/', QString::SkipEmptyParts);
+    const QStringList names = path.split(QLatin1Char('/'), QString::SkipEmptyParts);
    QDomElement el = baseElement;
-    foreach (QString name, names)
+    foreach (const QString &name, names)
    {
        QDomElement p = el;
-        el = d->mXml.createElement("Menu");
+        el = d->mXml.createElement(QLatin1String("Menu"));
        p.appendChild(el);
-        el.setAttribute("name", name);
+        el.setAttribute(QLatin1String("name"), name);
    }
    return el;
@ -454,17 +454,17 @@ void XdgMenuPrivate::moveMenus(QDomElement& element)
    Q_Q(XdgMenu);
    {
-        MutableDomElementIterator i(element, "Menu");
+        MutableDomElementIterator i(element, QLatin1String("Menu"));
        while(i.hasNext())
            moveMenus(i.next());
    }
-    MutableDomElementIterator i(element, "Move");
+    MutableDomElementIterator i(element, QLatin1String("Move"));
    while(i.hasNext())
    {
        i.next();
-        QString oldPath = i.current().lastChildElement("Old").text();
+        QString oldPath = i.current().lastChildElement(QLatin1String("Old")).text();
-        QString newPath = i.current().lastChildElement("New").text();
+        QString newPath = i.current().lastChildElement(QLatin1String("New")).text();
        element.removeChild(i.current());
@ -494,12 +494,12 @@ void XdgMenuPrivate::moveMenus(QDomElement& element)
 ************************************************/
 void XdgMenuPrivate::deleteDeletedMenus(QDomElement& element)
 {
-    MutableDomElementIterator i(element, "Menu");
+    MutableDomElementIterator i(element, QLatin1String("Menu"));
    while(i.hasNext())
    {
        QDomElement e = i.next();
-        if (e.attribute("deleted") == "1" ||
+        if (e.attribute(QLatin1String("deleted")) == QLatin1String("1") ||
-            e.attribute("name") == ".hidden"
+            e.attribute(QLatin1String("name")) == QLatin1String(".hidden")
            )
            element.removeChild(e);
        else
@ -514,7 +514,7 @@ void XdgMenuPrivate::processDirectoryEntries(QDomElement& element, const QString
    QStringList dirs;
    QStringList files;
-    element.setAttribute("title", element.attribute("name"));
+    element.setAttribute(QLatin1String("title"), element.attribute(QLatin1String("name")));
    MutableDomElementIterator i(element, QString());
    i.toBack();
@ -522,13 +522,13 @@ void XdgMenuPrivate::processDirectoryEntries(QDomElement& element, const QString
    {
        QDomElement e = i.previous();
-        if (e.tagName() == "Directory")
+        if (e.tagName() == QLatin1String("Directory"))
        {
            files << e.text();
            element.removeChild(e);
        }
-        else if (e.tagName() == "DirectoryDir")
+        else if (e.tagName() == QLatin1String("DirectoryDir"))
        {
            dirs << e.text();
            element.removeChild(e);
@ -538,14 +538,14 @@ void XdgMenuPrivate::processDirectoryEntries(QDomElement& element, const QString
    dirs << parentDirs;
    bool found = false;
-    foreach(QString file, files){
+    foreach(const QString &file, files){
-        if (file.startsWith('/'))
+        if (file.startsWith(QLatin1Char('/')))
            found = loadDirectoryFile(file, element);
        else
        {
-            foreach (QString dir, dirs)
+            foreach (const QString &dir, dirs)
            {
-                found = loadDirectoryFile(dir + "/" + file, element);
+                found = loadDirectoryFile(dir + QLatin1Char('/') + file, element);
                if (found) break;
            }
        }
@ -553,7 +553,7 @@ void XdgMenuPrivate::processDirectoryEntries(QDomElement& element, const QString
    }
-    MutableDomElementIterator it(element, "Menu");
+    MutableDomElementIterator it(element, QLatin1String("Menu"));
    while(it.hasNext())
    {
        QDomElement e = it.next();
@ -572,9 +572,9 @@ bool XdgMenuPrivate::loadDirectoryFile(const QString& fileName, QDomElement& ele
        return false;
-    element.setAttribute("title", file.localizedValue("Name").toString());
+    element.setAttribute(QLatin1String("title"), file.localizedValue(QLatin1String("Name")).toString());
-    element.setAttribute("comment", file.localizedValue("Comment").toString());
+    element.setAttribute(QLatin1String("comment"), file.localizedValue(QLatin1String("Comment")).toString());
-    element.setAttribute("icon", file.value("Icon").toString());
+    element.setAttribute(QLatin1String("icon"), file.value(QLatin1String("Icon")).toString());
    Q_Q(XdgMenu);
    q->addWatchPath(QFileInfo(file.fileName()).absolutePath());
@ -592,15 +592,15 @@ void XdgMenuPrivate::processApps(QDomElement& element)
 void XdgMenuPrivate::deleteEmpty(QDomElement& element)
 {
-    MutableDomElementIterator it(element, "Menu");
+    MutableDomElementIterator it(element, QLatin1String("Menu"));
    while(it.hasNext())
        deleteEmpty(it.next());
-    if (element.attribute("keep") == "true")
+    if (element.attribute(QLatin1String("keep")) == QLatin1String("true"))
        return;
-    QDomElement childMenu = element.firstChildElement("Menu");
+    QDomElement childMenu = element.firstChildElement(QLatin1String("Menu"));
-    QDomElement childApps = element.firstChildElement("AppLink");
+    QDomElement childApps = element.firstChildElement(QLatin1String("AppLink"));
    if (childMenu.isNull() && childApps.isNull())
    {
@ -619,25 +619,25 @@ void XdgMenuPrivate::processLayouts(QDomElement& element)
 void XdgMenuPrivate::fixSeparators(QDomElement& element)
 {
-    MutableDomElementIterator it(element, "Separator");
+    MutableDomElementIterator it(element, QLatin1String("Separator"));
    while(it.hasNext())
    {
        QDomElement s = it.next();
-        if (s.previousSiblingElement().tagName() == "Separator")
+        if (s.previousSiblingElement().tagName() == QLatin1String("Separator"))
            element.removeChild(s);
    }
    QDomElement first = element.firstChild().toElement();
-    if (first.tagName() == "Separator")
+    if (first.tagName() == QLatin1String("Separator"))
        element.removeChild(first);
    QDomElement last = element.lastChild().toElement();
-    if (last.tagName() == "Separator")
+    if (last.tagName() == QLatin1String("Separator"))
        element.removeChild(last);
-    MutableDomElementIterator mi(element, "Menu");
+    MutableDomElementIterator mi(element, QLatin1String("Menu"));
    while(mi.hasNext())
        fixSeparators(mi.next());
 }
@ -649,32 +649,32 @@ void XdgMenuPrivate::fixSeparators(QDomElement& element)
 ************************************************/
 QString XdgMenu::getMenuFileName(const QString& baseName)
 {
-    QStringList configDirs = XdgDirs::configDirs();
+    const QStringList configDirs = XdgDirs::configDirs();
-    QString menuPrefix = getenv("XDG_MENU_PREFIX");
+    QString menuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
-    foreach(QString configDir, configDirs)
+    foreach(const QString &configDir, configDirs)
    {
-        QFileInfo file(QString("%1/menus/%2%3").arg(configDir, menuPrefix, baseName));
+        QFileInfo file(QString::fromLatin1("%1/menus/%2%3").arg(configDir, menuPrefix, baseName));
        if (file.exists())
            return file.filePath();
    }
    QStringList wellKnownFiles;
    // razor- is a priority for us
-    wellKnownFiles << "razor-applications.menu";
+    wellKnownFiles << QLatin1String("razor-applications.menu");
    // the "global" menu file name on suse and fedora
-    wellKnownFiles << "applications.menu";
+    wellKnownFiles << QLatin1String("applications.menu");
    // rest files ordered by priority (descending)
-    wellKnownFiles << "kde4-applications.menu";
+    wellKnownFiles << QLatin1String("kde4-applications.menu");
-    wellKnownFiles << "kde-applications.menu";
+    wellKnownFiles << QLatin1String("kde-applications.menu");
-    wellKnownFiles << "gnome-applications.menu";
+    wellKnownFiles << QLatin1String("gnome-applications.menu");
-    wellKnownFiles << "lxde-applications.menu";
+    wellKnownFiles << QLatin1String("lxde-applications.menu");
-    foreach(QString configDir, configDirs)
+    foreach(const QString &configDir, configDirs)
    {
-        foreach (QString f, wellKnownFiles)
+        foreach (const QString &f, wellKnownFiles)
        {
-            QFileInfo file(QString("%1/menus/%2").arg(configDir, f));
+            QFileInfo file(QString::fromLatin1("%1/menus/%2").arg(configDir, f));
            if (file.exists())
                return file.filePath();
        }
--- a/qtxdg/xdgmenu.h
+++ b/qtxdg/xdgmenu.h
@ -108,7 +108,7 @@ public:
     */
    void setLogDir(const QString& directory);
-    static QString getMenuFileName(const QString& baseName = "applications.menu");
+    static QString getMenuFileName(const QString& baseName = QLatin1String("applications.menu"));
    bool isOutDated() const;
--- a/qtxdg/xdgmenu_p.h
+++ b/qtxdg/xdgmenu_p.h
--- a/qtxdg/xdgmenuapplinkprocessor.cpp
+++ b/qtxdg/xdgmenuapplinkprocessor.cpp
@ -40,9 +40,9 @@ XdgMenuApplinkProcessor::XdgMenuApplinkProcessor(QDomElement& element,  XdgMenu*
    mParent = parent;
    mMenu = menu;
-    mOnlyUnallocated = element.attribute("onlyUnallocated") == "1";
+    mOnlyUnallocated = element.attribute(QLatin1String("onlyUnallocated")) == QLatin1String("1");
-    MutableDomElementIterator i(element, "Menu");
+    MutableDomElementIterator i(element, QLatin1String("Menu"));
    while(i.hasNext())
    {
        QDomElement e = i.next();
@ -122,18 +122,18 @@ void XdgMenuApplinkProcessor::step2()
        if (!show)
            continue;
-        QDomElement appLink = doc.createElement("AppLink");
+        QDomElement appLink = doc.createElement(QLatin1String("AppLink"));
-        appLink.setAttribute("id", fileInfo->id());
+        appLink.setAttribute(QLatin1String("id"), fileInfo->id());
-        appLink.setAttribute("title", file->localizedValue("Name").toString());
+        appLink.setAttribute(QLatin1String("title"), file->localizedValue(QLatin1String("Name")).toString());
-        appLink.setAttribute("comment", file->localizedValue("Comment").toString());
+        appLink.setAttribute(QLatin1String("comment"), file->localizedValue(QLatin1String("Comment")).toString());
-        appLink.setAttribute("genericName", file->localizedValue("GenericName").toString());
+        appLink.setAttribute(QLatin1String("genericName"), file->localizedValue(QLatin1String("GenericName")).toString());
-        appLink.setAttribute("exec", file->value("Exec").toString());
+        appLink.setAttribute(QLatin1String("exec"), file->value(QLatin1String("Exec")).toString());
-        appLink.setAttribute("terminal", file->value("Terminal").toBool());
+        appLink.setAttribute(QLatin1String("terminal"), file->value(QLatin1String("Terminal")).toBool());
-        appLink.setAttribute("startupNotify", file->value("StartupNotify").toBool());
+        appLink.setAttribute(QLatin1String("startupNoify"), file->value(QLatin1String("StartupNotify")).toBool());
-        appLink.setAttribute("path", file->value("Path").toString());
+        appLink.setAttribute(QLatin1String("path"), file->value(QLatin1String("Path")).toString());
-        appLink.setAttribute("icon", file->value("Icon").toString());
+        appLink.setAttribute(QLatin1String("icon"), file->value(QLatin1String("Icon")).toString());
-        appLink.setAttribute("desktopFile", file->fileName());
+        appLink.setAttribute(QLatin1String("desktopFile"), file->fileName());
        mElement.appendChild(appLink);
@ -159,7 +159,7 @@ void XdgMenuApplinkProcessor::fillAppFileInfoList()
 {
    // Build a pool by collecting entries found in <AppDir>
    {
-        MutableDomElementIterator i(mElement, "AppDir");
+        MutableDomElementIterator i(mElement, QLatin1String("AppDir"));
        i.toBack();
        while(i.hasPrevious())
        {
@ -187,9 +187,9 @@ void XdgMenuApplinkProcessor::findDesktopFiles(const QString& dirName, const QSt
 {
    QDir dir(dirName);
    mMenu->addWatchPath(dir.absolutePath());
-    QFileInfoList files = dir.entryInfoList(QStringList("*.desktop"), QDir::Files);
+    const QFileInfoList files = dir.entryInfoList(QStringList(QLatin1String("*.desktop")), QDir::Files);
-    foreach (QFileInfo file, files)
+    foreach (const QFileInfo &file, files)
    {
        XdgDesktopFile* f = XdgDesktopFileCache::getFile(file.canonicalFilePath());
        if (f)
@ -198,13 +198,13 @@ void XdgMenuApplinkProcessor::findDesktopFiles(const QString& dirName, const QSt
    // Working recursively ............
-    QFileInfoList dirs = dir.entryInfoList(QStringList(), QDir::Dirs | QDir::NoDotAndDotDot);
+    const QFileInfoList dirs = dir.entryInfoList(QStringList(), QDir::Dirs | QDir::NoDotAndDotDot);
-    foreach (QFileInfo d, dirs)
+    foreach (const QFileInfo &d, dirs)
    {
        QString dn = d.canonicalFilePath();
        if (dn != dirName)
        {
-            findDesktopFiles(dn, QString("%1%2-").arg(prefix, d.fileName()));
+            findDesktopFiles(dn, QString::fromLatin1("%1%2-").arg(prefix, d.fileName()));
        }
    }
 }
@ -216,13 +216,13 @@ void XdgMenuApplinkProcessor::createRules()
    while(i.hasNext())
    {
        QDomElement e = i.next();
-        if (e.tagName()=="Include")
+        if (e.tagName()== QLatin1String("Include"))
        {
            mRules.addInclude(e);
            mElement.removeChild(e);
        }
-        else if (e.tagName()=="Exclude")
+        else if (e.tagName()== QLatin1String("Exclude"))
        {
            mRules.addExclude(e);
            mElement.removeChild(e);
@ -240,9 +240,9 @@ bool XdgMenuApplinkProcessor::checkTryExec(const QString& progName)
    if (progName.startsWith(QDir::separator()))
        return QFileInfo(progName).isExecutable();
-    QStringList dirs = QString(getenv("PATH")).split(":");
+    const QStringList dirs = QFile::decodeName(qgetenv("PATH")).split(QLatin1Char(':'));
-    foreach (QString dir, dirs)
+    foreach (const QString &dir, dirs)
    {
        if (QFileInfo(QDir(dir), progName).isExecutable())
            return true;
@ -250,4 +250,3 @@ bool XdgMenuApplinkProcessor::checkTryExec(const QString& progName)
    return false;
 }
--- a/qtxdg/xdgmenuapplinkprocessor.h
+++ b/qtxdg/xdgmenuapplinkprocessor.h
--- a/qtxdg/xdgmenulayoutprocessor.cpp
+++ b/qtxdg/xdgmenulayoutprocessor.cpp
@ -68,20 +68,20 @@ XdgMenuLayoutProcessor::XdgMenuLayoutProcessor(QDomElement& element):
    mDefaultParams.mInlineHeader = true;
    mDefaultParams.mInlineAlias = false;
-    mDefaultLayout = findLastElementByTag(element, "DefaultLayout");
+    mDefaultLayout = findLastElementByTag(element, QLatin1String("DefaultLayout"));
    if (mDefaultLayout.isNull())
    {
        // Create DefaultLayout node
        QDomDocument doc = element.ownerDocument();
-        mDefaultLayout = doc.createElement("DefaultLayout");
+        mDefaultLayout = doc.createElement(QLatin1String("DefaultLayout"));
-        QDomElement menus = doc.createElement("Merge");
+        QDomElement menus = doc.createElement(QLatin1String("Merge"));
-        menus.setAttribute("type", "menus");
+        menus.setAttribute(QLatin1String("type"), QLatin1String("menus"));
        mDefaultLayout.appendChild(menus);
-        QDomElement files = doc.createElement("Merge");
+        QDomElement files = doc.createElement(QLatin1String("Merge"));
-        files.setAttribute("type", "files");
+        files.setAttribute(QLatin1String("type"), QLatin1String("files"));
        mDefaultLayout.appendChild(files);
        mElement.appendChild(mDefaultLayout);
@ -91,7 +91,7 @@ XdgMenuLayoutProcessor::XdgMenuLayoutProcessor(QDomElement& element):
    // If a menu does not contain a <Layout> element or if it contains an empty <Layout> element
    // then the default layout should be used.
-    mLayout = findLastElementByTag(element, "Layout");
+    mLayout = findLastElementByTag(element, QLatin1String("Layout"));
    if (mLayout.isNull() || !mLayout.hasChildNodes())
        mLayout = mDefaultLayout;
 }
@ -103,7 +103,7 @@ XdgMenuLayoutProcessor::XdgMenuLayoutProcessor(QDomElement& element, XdgMenuLayo
    mDefaultParams = parent->mDefaultParams;
    // DefaultLayout ............................
-    QDomElement defaultLayout = findLastElementByTag(element, "DefaultLayout");
+    QDomElement defaultLayout = findLastElementByTag(element, QLatin1String("DefaultLayout"));
    if (defaultLayout.isNull())
        mDefaultLayout = parent->mDefaultLayout;
@ -114,7 +114,7 @@ XdgMenuLayoutProcessor::XdgMenuLayoutProcessor(QDomElement& element, XdgMenuLayo
    // If a menu does not contain a <Layout> element or if it contains an empty <Layout> element
    // then the default layout should be used.
-    mLayout = findLastElementByTag(element, "Layout");
+    mLayout = findLastElementByTag(element, QLatin1String("Layout"));
    if (mLayout.isNull() || !mLayout.hasChildNodes())
        mLayout = mDefaultLayout;
@ -123,20 +123,20 @@ XdgMenuLayoutProcessor::XdgMenuLayoutProcessor(QDomElement& element, XdgMenuLayo
 void XdgMenuLayoutProcessor::setParams(QDomElement defaultLayout, LayoutParams *result)
 {
-    if (defaultLayout.hasAttribute("show_empty"))
+    if (defaultLayout.hasAttribute(QLatin1String("show_empty")))
-        result->mShowEmpty = defaultLayout.attribute("show_empty") == "true";
+        result->mShowEmpty = defaultLayout.attribute(QLatin1String("show_empty")) == QLatin1String("true");
-    if (defaultLayout.hasAttribute("inline"))
+    if (defaultLayout.hasAttribute(QLatin1String("inline")))
-        result->mInline = defaultLayout.attribute("inline") == "true";
+        result->mInline = defaultLayout.attribute(QLatin1String("inline")) == QLatin1String("true");
-    if (defaultLayout.hasAttribute("inline_limit"))
+    if (defaultLayout.hasAttribute(QLatin1String("inline_limit")))
-        result->mInlineLimit = defaultLayout.attribute("inline_limit").toInt();
+        result->mInlineLimit = defaultLayout.attribute(QLatin1String("inline_limit")).toInt();
-    if (defaultLayout.hasAttribute("inline_header"))
+    if (defaultLayout.hasAttribute(QLatin1String("inline_header")))
-        result->mInlineHeader = defaultLayout.attribute("inline_header") == "true";
+        result->mInlineHeader = defaultLayout.attribute(QLatin1String("inline_header")) == QLatin1String("true");
-    if (defaultLayout.hasAttribute("inline_alias"))
+    if (defaultLayout.hasAttribute(QLatin1String("inline_alias")))
-        result->mInlineAlias = defaultLayout.attribute("inline_alias") == "true";
+        result->mInlineAlias = defaultLayout.attribute(QLatin1String("inline_alias")) == QLatin1String("true");
 }
@ -163,7 +163,7 @@ int childsCount(const QDomElement& element)
    while (it.hasNext())
    {
        QString tag = it.next().tagName();
-        if (tag == "AppLink" || tag == "Menu" || tag == "Separator")
+        if (tag == QLatin1String("AppLink") || tag == QLatin1String("Menu") || tag == QLatin1String("Separator"))
            count ++;
    }
@ -174,12 +174,12 @@ int childsCount(const QDomElement& element)
 void XdgMenuLayoutProcessor::run()
 {
    QDomDocument doc = mLayout.ownerDocument();
-    mResult = doc.createElement("Result");
+    mResult = doc.createElement(QLatin1String("Result"));
    mElement.appendChild(mResult);
    // Process childs menus ...............................
    {
-        DomElementIterator it(mElement, "Menu");
+        DomElementIterator it(mElement, QLatin1String("Menu"));
        while (it.hasNext())
        {
            QDomElement e = it.next();
@ -196,26 +196,26 @@ void XdgMenuLayoutProcessor::run()
    {
        QDomElement e = it.next();
-        if (e.tagName() == "Filename")
+        if (e.tagName() == QLatin1String("Filename"))
            processFilenameTag(e);
-        else if (e.tagName() == "Menuname")
+        else if (e.tagName() == QLatin1String("Menuname"))
            processMenunameTag(e);
-        else if (e.tagName() == "Separator")
+        else if (e.tagName() == QLatin1String("Separator"))
            processSeparatorTag(e);
-        else if (e.tagName() == "Merge")
+        else if (e.tagName() == QLatin1String("Merge"))
        {
-            QDomElement merge = mResult.ownerDocument().createElement("Merge");
+            QDomElement merge = mResult.ownerDocument().createElement(QLatin1String("Merge"));
-            merge.setAttribute("type", e.attribute("type"));
+            merge.setAttribute(QLatin1String("type"), e.attribute(QLatin1String("type")));
            mResult.appendChild(merge);
        }
    }
    // Step 2 ...................................
    {
-        MutableDomElementIterator ri(mResult, "Merge");
+        MutableDomElementIterator ri(mResult, QLatin1String("Merge"));
        while (ri.hasNext())
        {
            processMergeTag(ri.next());
@ -249,7 +249,7 @@ void XdgMenuLayoutProcessor::processFilenameTag(const QDomElement &element)
 {
    QString id = element.text();
-    QDomElement appLink = searchElement("AppLink", "id", id);
+    QDomElement appLink = searchElement(QLatin1String("AppLink"), QLatin1String("id"), id);
    if (!appLink.isNull())
        mResult.appendChild(appLink);
 }
@ -290,7 +290,7 @@ void XdgMenuLayoutProcessor::processFilenameTag(const QDomElement &element)
 void XdgMenuLayoutProcessor::processMenunameTag(const QDomElement &element)
 {
    QString id = element.text();
-    QDomElement menu = searchElement("Menu", "name", id);
+    QDomElement menu = searchElement(QLatin1String("Menu"), QLatin1String("name"), id);
    if (menu.isNull())
        return;
@ -303,7 +303,7 @@ void XdgMenuLayoutProcessor::processMenunameTag(const QDomElement &element)
    {
        if (params.mShowEmpty)
        {
-            menu.setAttribute("keep", "true");
+            menu.setAttribute(QLatin1String("keep"), QLatin1String("true"));
            mResult.appendChild(menu);
        }
        return;
@ -330,7 +330,7 @@ void XdgMenuLayoutProcessor::processMenunameTag(const QDomElement &element)
    // Header ....................................
    if (doHeader)
    {
-        QDomElement header = mLayout.ownerDocument().createElement("Header");
+        QDomElement header = mLayout.ownerDocument().createElement(QLatin1String("Header"));
        QDomNamedNodeMap attrs = menu.attributes();
        for (int i=0; i < attrs.count(); ++i)
@ -344,7 +344,7 @@ void XdgMenuLayoutProcessor::processMenunameTag(const QDomElement &element)
    // Alias .....................................
    if (doAlias)
    {
-        menu.firstChild().toElement().setAttribute("title", menu.attribute("title"));
+        menu.firstChild().toElement().setAttribute(QLatin1String("title"), menu.attribute(QLatin1String("title")));
    }
    // Inline ....................................
@ -364,7 +364,7 @@ void XdgMenuLayoutProcessor::processMenunameTag(const QDomElement &element)
 ************************************************/
 void XdgMenuLayoutProcessor::processSeparatorTag(const QDomElement &element)
 {
-    QDomElement separator = element.ownerDocument().createElement("Separator");
+    QDomElement separator = element.ownerDocument().createElement(QLatin1String("Separator"));
    mResult.appendChild(separator);
 }
@ -387,7 +387,7 @@ void XdgMenuLayoutProcessor::processSeparatorTag(const QDomElement &element)
 ************************************************/
 void XdgMenuLayoutProcessor::processMergeTag(const QDomElement &element)
 {
-    QString type = element.attribute("type");
+    QString type = element.attribute(QLatin1String("type"));
    QMap<QString, QDomElement> map;
    MutableDomElementIterator it(mElement);
@ -395,10 +395,10 @@ void XdgMenuLayoutProcessor::processMergeTag(const QDomElement &element)
    {
        QDomElement e = it.next();
        if (
-            ((type == "menus" || type == "all") && e.tagName() == "Menu" ) ||
+            ((type == QLatin1String("menus") || type == QLatin1String("all")) && e.tagName() == QLatin1String("Menu" )) ||
-            ((type == "files" || type == "all") && e.tagName() == "AppLink")
+            ((type == QLatin1String("files") || type == QLatin1String("all")) && e.tagName() == QLatin1String("AppLink"))
           )
-            map.insert(e.attribute("title"), e);
+            map.insert(e.attribute(QLatin1String("title")), e);
    }
    QMapIterator<QString, QDomElement> mi(map);
--- a/qtxdg/xdgmenulayoutprocessor.h
+++ b/qtxdg/xdgmenulayoutprocessor.h
--- a/qtxdg/xdgmenureader.cpp
+++ b/qtxdg/xdgmenureader.cpp
@ -76,7 +76,7 @@ bool XdgMenuReader::load(const QString& fileName, const QString& baseDir)
    QFile file(mFileName);
    if (!file.open(QFile::ReadOnly | QFile::Text))
    {
-        mErrorStr = QString("%1 not loading: %2").arg(fileName).arg(file.errorString());
+        mErrorStr = QString::fromLatin1("%1 not loading: %2").arg(fileName).arg(file.errorString());
        return false;
    }
    //qDebug() << "Load file:" << mFileName;
@ -88,7 +88,7 @@ bool XdgMenuReader::load(const QString& fileName, const QString& baseDir)
    if (!mXml.setContent(&file, true, &errorStr, &errorLine, &errorColumn))
    {
-        mErrorStr = QString("Parse error at line %1, column %2:\n%3")
+        mErrorStr = QString::fromLatin1("Parse error at line %1, column %2:\n%3")
                        .arg(errorLine)
                        .arg(errorColumn)
                        .arg(errorStr);
@ -97,10 +97,10 @@ bool XdgMenuReader::load(const QString& fileName, const QString& baseDir)
    QDomElement root = mXml.documentElement();
-    QDomElement debugElement = mXml.createElement("FileInfo");
+    QDomElement debugElement = mXml.createElement(QLatin1String("FileInfo"));
-    debugElement.setAttribute("file", mFileName);
+    debugElement.setAttribute(QLatin1String("file"), mFileName);
    if (mParentReader)
-        debugElement.setAttribute("parent", mParentReader->fileName());
+        debugElement.setAttribute(QLatin1String("parent"), mParentReader->fileName());
    QDomNode null;
    root.insertBefore(debugElement, null);
@ -124,49 +124,49 @@ void XdgMenuReader::processMergeTags(QDomElement& element)
    {
        QDomElement next = n.previousSiblingElement();
        // MergeFile ..................
-        if (n.tagName() == "MergeFile")
+        if (n.tagName() == QLatin1String("MergeFile"))
        {
            processMergeFileTag(n, &mergedFiles);
            n.parentNode().removeChild(n);
        }
        // MergeDir ...................
-        else if(n.tagName() == "MergeDir")
+        else if(n.tagName() == QLatin1String("MergeDir"))
        {
            processMergeDirTag(n, &mergedFiles);
            n.parentNode().removeChild(n);
        }
        // DefaultMergeDirs ...........
-        else if (n.tagName() == "DefaultMergeDirs")
+        else if (n.tagName() == QLatin1String("DefaultMergeDirs"))
        {
            processDefaultMergeDirsTag(n, &mergedFiles);
            n.parentNode().removeChild(n);
        }
        // AppDir ...................
-        else if(n.tagName() == "AppDir")
+        else if(n.tagName() == QLatin1String("AppDir"))
        {
            processAppDirTag(n);
            n.parentNode().removeChild(n);
        }
        // DefaultAppDirs .............
-        else if(n.tagName() == "DefaultAppDirs")
+        else if(n.tagName() == QLatin1String("DefaultAppDirs"))
        {
            processDefaultAppDirsTag(n);
            n.parentNode().removeChild(n);
        }
        // DirectoryDir ...................
-        else if(n.tagName() == "DirectoryDir")
+        else if(n.tagName() == QLatin1String("DirectoryDir"))
        {
            processDirectoryDirTag(n);
            n.parentNode().removeChild(n);
        }
        // DefaultDirectoryDirs ...........
-        else if(n.tagName() == "DefaultDirectoryDirs")
+        else if(n.tagName() == QLatin1String("DefaultDirectoryDirs"))
        {
            processDefaultDirectoryDirsTag(n);
            n.parentNode().removeChild(n);
@ -174,7 +174,7 @@ void XdgMenuReader::processMergeTags(QDomElement& element)
        // Menu .......................
-        else if(n.tagName() == "Menu")
+        else if(n.tagName() == QLatin1String("Menu"))
        {
            processMergeTags(n);
        }
@ -205,7 +205,7 @@ void XdgMenuReader::processMergeFileTag(QDomElement& element, QStringList* merge
 {
    //qDebug() << "Process " << element;// << "in" << mFileName;
-    if (element.attribute("type") != "parent")
+    if (element.attribute(QLatin1String("type")) != QLatin1String("parent"))
    {
        mergeFile(element.text(), element, mergedFiles);
    }
@ -215,7 +215,7 @@ void XdgMenuReader::processMergeFileTag(QDomElement& element, QStringList* merge
        QString relativeName;
        QStringList configDirs = XdgDirs::configDirs();
-        foreach (QString configDir, configDirs)
+        foreach (const QString &configDir, configDirs)
        {
            if (mFileName.startsWith(configDir))
            {
@ -236,7 +236,7 @@ void XdgMenuReader::processMergeFileTag(QDomElement& element, QStringList* merge
        if (relativeName.isEmpty())
            return;
-        foreach (QString configDir, configDirs)
+        foreach (const QString &configDir, configDirs)
        {
            if (QFileInfo(configDir + relativeName).exists())
            {
@ -288,20 +288,20 @@ void XdgMenuReader::processDefaultMergeDirsTag(QDomElement& element, QStringList
    //qDebug() << "Process " << element;// << "in" << mFileName;
    QString menuBaseName = QFileInfo(mMenu->menuFileName()).baseName();
-    int n = menuBaseName.lastIndexOf('-');
+    int n = menuBaseName.lastIndexOf(QLatin1Char('-'));
    if (n>-1)
        menuBaseName = menuBaseName.mid(n+1);
    QStringList dirs = XdgDirs::configDirs();
    dirs << XdgDirs::configHome();
-    foreach (QString dir, dirs)
+    foreach (const QString &dir, dirs)
    {
-        mergeDir(QString("%1/menus/%2-merged").arg(dir).arg(menuBaseName), element, mergedFiles);
+        mergeDir(QString::fromLatin1("%1/menus/%2-merged").arg(dir).arg(menuBaseName), element, mergedFiles);
    }
-    if (menuBaseName == "applications")
+    if (menuBaseName == QLatin1String("applications"))
-        mergeFile(QString("%1/menus/applications-kmenuedit.menu").arg(XdgDirs::configHome()), element, mergedFiles);
+        mergeFile(QString::fromLatin1("%1/menus/applications-kmenuedit.menu").arg(XdgDirs::configHome()), element, mergedFiles);
 }
@ -312,7 +312,7 @@ void XdgMenuReader::processDefaultMergeDirsTag(QDomElement& element, QStringList
 void XdgMenuReader::processAppDirTag(QDomElement& element)
 {
    //qDebug() << "Process " << element;
-    addDirTag(element, "AppDir", element.text());
+    addDirTag(element, QLatin1String("AppDir"), element.text());
 }
@ -329,10 +329,10 @@ void XdgMenuReader::processDefaultAppDirsTag(QDomElement& element)
    QStringList dirs = XdgDirs::dataDirs();
    dirs.prepend(XdgDirs::dataHome(false));
-    foreach (QString dir, dirs)
+    foreach (const QString &dir, dirs)
    {
        //qDebug() << "Add AppDir: " << dir + "/applications/";
-        addDirTag(element, "AppDir", dir + "/applications/");
+        addDirTag(element, QLatin1String("AppDir"), dir + QLatin1String("/applications/"));
    }
 }
@ -343,7 +343,7 @@ void XdgMenuReader::processDefaultAppDirsTag(QDomElement& element)
 void XdgMenuReader::processDirectoryDirTag(QDomElement& element)
 {
    //qDebug() << "Process " << element;
-    addDirTag(element, "DirectoryDir", element.text());
+    addDirTag(element, QLatin1String("DirectoryDir"), element.text());
 }
@ -360,8 +360,8 @@ void XdgMenuReader::processDefaultDirectoryDirsTag(QDomElement& element)
    QStringList dirs = XdgDirs::dataDirs();
    dirs.prepend(XdgDirs::dataHome(false));
-    foreach (QString dir, dirs)
+    foreach (const QString &dir, dirs)
-        addDirTag(element, "DirectoryDir", dir + "/desktop-directories/");
+        addDirTag(element, QLatin1String("DirectoryDir"), dir + QLatin1String("/desktop-directories/"));
 }
 /************************************************
@ -409,7 +409,7 @@ void XdgMenuReader::mergeFile(const QString& fileName, QDomElement& element, QSt
        {
            // As a special exception, remove the <Name> element from the root
            // element of each file being merged.
-            if (n.tagName() != "Name")
+            if (n.tagName() != QLatin1String("Name"))
            {
                QDomNode imp = mXml.importNode(n, true);
                element.parentNode().insertBefore(imp, element);
@ -429,9 +429,9 @@ void XdgMenuReader::mergeDir(const QString& dirName, QDomElement& element, QStri
    {
        //qDebug() << "Merge dir: " << dirInfo.canonicalFilePath();
        QDir dir = QDir(dirInfo.canonicalFilePath());
-        const QFileInfoList files = dir.entryInfoList(QStringList() << "*.menu", QDir::Files | QDir::Readable);
+        const QFileInfoList files = dir.entryInfoList(QStringList() << QLatin1String("*.menu"), QDir::Files | QDir::Readable);
-        foreach (QFileInfo file, files)
+        foreach (const QFileInfo &file, files)
            mergeFile(file.canonicalFilePath(), element, mergedFiles);
    }
 }
--- a/qtxdg/xdgmenureader.h
+++ b/qtxdg/xdgmenureader.h
--- a/qtxdg/xdgmenurules.cpp
+++ b/qtxdg/xdgmenurules.cpp
@ -63,26 +63,26 @@ XdgMenuRuleOr::XdgMenuRuleOr(const QDomElement& element, QObject* parent) :
    {
        QDomElement e = iter.next();
-        if (e.tagName() == "Or")
+        if (e.tagName() == QLatin1String("Or"))
            mChilds.append(new XdgMenuRuleOr(e, this));
-        else if (e.tagName() == "And")
+        else if (e.tagName() == QLatin1String("And"))
            mChilds.append(new XdgMenuRuleAnd(e, this));
-        else if (e.tagName() == "Not")
+        else if (e.tagName() == QLatin1String("Not"))
            mChilds.append(new XdgMenuRuleNot(e, this));
-        else if (e.tagName() == "Filename")
+        else if (e.tagName() == QLatin1String("Filename"))
            mChilds.append(new XdgMenuRuleFileName(e, this));
-        else if (e.tagName() == "Category")
+        else if (e.tagName() == QLatin1String("Category"))
            mChilds.append(new XdgMenuRuleCategory(e, this));
-        else if (e.tagName() == "All")
+        else if (e.tagName() == QLatin1String("All"))
            mChilds.append(new XdgMenuRuleAll(e, this));
        else
-            qWarning() << "Unknown rule" << e.tagName();
+            qWarning() << QString::fromLatin1("Unknown rule") << e.tagName();
    }
 }
--- a/qtxdg/xdgmenurules.h
+++ b/qtxdg/xdgmenurules.h
--- a/qtxdg/xdgmenuwidget.cpp
+++ b/qtxdg/xdgmenuwidget.cpp
@ -99,13 +99,13 @@ void XdgMenuWidgetPrivate::init(const QDomElement& xml)
    q->clear();
    QString title;
-    if (! xml.attribute("title").isEmpty())
+    if (! xml.attribute(QLatin1String("title")).isEmpty())
-        title = xml.attribute("title");
+        title = xml.attribute(QLatin1String("title"));
    else
-        title = xml.attribute("name");
+        title = xml.attribute(QLatin1String("name"));
    q->setTitle(escape(title));
-    q->setToolTip(xml.attribute("comment"));
+    q->setToolTip(xml.attribute(QLatin1String("comment")));
    QIcon parentIcon;
@ -113,7 +113,7 @@ void XdgMenuWidgetPrivate::init(const QDomElement& xml)
    if (parentMenu)
        parentIcon = parentMenu->icon();
-    q->setIcon(XdgIcon::fromTheme(mXml.attribute("icon"), parentIcon));
+    q->setIcon(XdgIcon::fromTheme(mXml.attribute(QLatin1String("icon")), parentIcon));
    buildMenu();
 }
@ -195,15 +195,15 @@ void XdgMenuWidgetPrivate::buildMenu()
        QDomElement xml = it.next();
        // Build submenu ........................
-        if (xml.tagName() == "Menu")
+        if (xml.tagName() == QLatin1String("Menu"))
            q->insertMenu(first, new XdgMenuWidget(xml, q));
        //Build application link ................
-        else if (xml.tagName() == "AppLink")
+        else if (xml.tagName() == QLatin1String("AppLink"))
            q->insertAction(first, createAction(xml));
        //Build separator .......................
-        else if (xml.tagName() == "Separator")
+        else if (xml.tagName() == QLatin1String("Separator"))
            q->insertSeparator(first);
    }
@ -213,18 +213,18 @@ void XdgMenuWidgetPrivate::buildMenu()
 XdgAction* XdgMenuWidgetPrivate::createAction(const QDomElement& xml)
 {
    Q_Q(XdgMenuWidget);
-    XdgAction* action = new XdgAction(xml.attribute("desktopFile"), q);
+    XdgAction* action = new XdgAction(xml.attribute(QLatin1String("desktopFile")), q);
    QString title;
-    if (!xml.attribute("title").isEmpty())
+    if (!xml.attribute(QLatin1String("title")).isEmpty())
-        title = xml.attribute("title");
+        title = xml.attribute(QLatin1String("title"));
    else
-        title = xml.attribute("name");
+        title = xml.attribute(QLatin1String("name"));
-    if (!xml.attribute("genericName").isEmpty() &&
+    if (!xml.attribute(QLatin1String("genericName")).isEmpty() &&
-         xml.attribute("genericName") != title)
+         xml.attribute(QLatin1String("genericName")) != title)
-        title += QString(" (%1)").arg(xml.attribute("genericName"));
+        title += QString::fromLatin1(" (%1)").arg(xml.attribute(QLatin1String("genericName")));
    action->setText(escape(title));
    return action;
@ -237,5 +237,5 @@ XdgAction* XdgMenuWidgetPrivate::createAction(const QDomElement& xml)
 ************************************************/
 QString XdgMenuWidgetPrivate::escape(QString string)
 {
-    return string.replace("&", "&&");
+    return string.replace(QLatin1Char('&'), QLatin1String("&&"));
 }
--- a/qtxdg/xdgmenuwidget.h
+++ b/qtxdg/xdgmenuwidget.h
--- a/qtxdg/xdgmimetype.cpp
+++ b/qtxdg/xdgmimetype.cpp
@ -96,7 +96,7 @@ QString XdgMimeType::iconName() const
        names.append(QMimeType::iconName());
        names.append(QMimeType::genericIconName());
-        foreach (QString s, names) {
+        foreach (const QString &s, names) {
            if (!XdgIcon::fromTheme(s).isNull()) {
                dx->iconName = s;
                break;
--- a/qtxdg/xdgmimetype.h
+++ b/qtxdg/xdgmimetype.h
--- a/qtxdg/xmlhelper.cpp
+++ b/qtxdg/xmlhelper.cpp
@ -39,10 +39,8 @@ QDebug operator<<(QDebug dbg, const QDomElement &el)
    QString args;
    for (int i=0; i<map.count(); ++i)
-        args += " " + map.item(i).nodeName() + "='" + map.item(i).nodeValue() + "'";
+        args += QLatin1Char(' ') + map.item(i).nodeName() + QLatin1Char('=') + map.item(i).nodeValue() + QLatin1Char('\'');
-    dbg.nospace() << QString("<%1%2>%3</%1>").arg(el.tagName()).arg(args).arg(el.text());
+    dbg.nospace() << QString::fromLatin1("<%1%2>%3</%1>").arg(el.tagName()).arg(args).arg(el.text());
    return dbg.space();
 }
--- a/qtxdg/xmlhelper.h
+++ b/qtxdg/xmlhelper.h
--- a/release.sh
+++ b/release.sh
@ -25,4 +25,4 @@ sha256sum --tag *.tar.gz *.tar.xz >> CHECKSUMS
 cd ..
 echo "Uploading to lxqt.org..."
-scp -r "$version" "lxde.org:/var/www/lxqt/downloads/$PROJECT/"
+scp -r "$version" "downloads.lxqt.org:/srv/downloads.lxqt.org/$PROJECT/"
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -1,5 +1,10 @@
 set(PROJECT_NAME "qtxdg_test")
 remove_definitions(
    -DQT_USE_QSTRINGBUILDER
    -DQT_NO_CAST_FROM_ASCII
 )
 set(CMAKE_AUTOMOC TRUE)
 macro(qtxdg_add_test)
@ -11,7 +16,7 @@ macro(qtxdg_add_test)
 endmacro()
 include_directories (
-    ${CMAKE_SOURCE_DIR}
+    "${CMAKE_SOURCE_DIR}/qtxdg"
    ${CMAKE_CURRENT_BINARY_DIR}
 )
@ -22,4 +27,5 @@ set_property(DIRECTORY APPEND
 qtxdg_add_test(
    qtxdg_test
    tst_xdgdirs
    tst_xdgdesktopfile
 )
--- a/test/tst_xdgdesktopfile.cpp
+++ b/test/tst_xdgdesktopfile.cpp
@ -0,0 +1,118 @@
 /*
 * libqtxdg - An Qt implementation of freedesktop.org xdg specs.
 * Copyright (C) 2016  Luís Pereira <luis.artur.pereira@gmail.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 *
 */
 #include "tst_xdgdesktopfile.h"
 #include "XdgDesktopFile"
 #include <QtTest>
 class Language
 {
 public:
    Language (const QString& lang)
    : mPreviousLang(QString::fromLocal8Bit(qgetenv("LANG")))
    {
        qputenv("LANG", lang.toLocal8Bit());
    }
    ~Language()
    {
        qputenv("LANG", mPreviousLang.toLocal8Bit());
    }
 private:
    QString mPreviousLang;
 };
 QTEST_MAIN(tst_xdgdesktopfile);
 void tst_xdgdesktopfile::testRead()
 {
    QTemporaryFile file("testReadXXXXXX.desktop");
    QVERIFY(file.open());
    const QString fileName = file.fileName();
    QTextStream ts(&file);
    ts <<
       "[Desktop Entry]\n"
       "Type=Application\n"
       "Name=MyApp\n"
       "Icon=foobar\n"
       "MimeType=text/plain;image/png;;\n"
       "\n";
    file.close();
    QVERIFY(QFile::exists(fileName));
    XdgDesktopFile df;
    df.load(fileName);
    QVERIFY(df.isValid());
    QCOMPARE(df.type(), XdgDesktopFile::ApplicationType);
    QCOMPARE(df.name(), QString::fromLatin1("MyApp"));
    QCOMPARE(df.iconName(), QString::fromLatin1("foobar"));
    QCOMPARE(df.mimeTypes(), QStringList() << QString::fromLatin1("text/plain")
             << QString::fromLatin1("image/png"));
    QCOMPARE(df.fileName(), QFileInfo(fileName).canonicalFilePath());
 }
 void tst_xdgdesktopfile::testReadLocalized_data()
 {
    QTest::addColumn<QString>("locale");
    QTest::addColumn<QString>("translation");
    const QString pt = QString::fromUtf8("A Minha Aplicação");
    const QString pt_BR = QString::fromUtf8("O Meu Aplicativo");
    QTest::newRow("pt") << QStringLiteral("pt") << pt;
    QTest::newRow("pt_PT") << QStringLiteral("pt_PT")  << pt;
    QTest::newRow("pt_BR") << QStringLiteral("pt_BR") << pt_BR;
    QTest::newRow("de") << QStringLiteral("de") << QStringLiteral("My Application");
 }
 void tst_xdgdesktopfile::testReadLocalized()
 {
    QTemporaryFile file("testReadLocalizedXXXXXX.desktop");
    QVERIFY(file.open());
    const QString fileName = file.fileName();
    QTextStream ts(&file);
    ts << QString::fromUtf8(
    "[Desktop Entry]\n"
    "Type=Application\n"
    "Name=My Application\n"
    "Name[pt]=A Minha Aplicação\n"
    "Name[pt_BR]=O Meu Aplicativo\n"
    "Icon=foo\n"
    "\n");
    file.close();
    QVERIFY(QFile::exists(fileName));
    XdgDesktopFile df;
    df.load(fileName);
    QVERIFY(df.isValid());
    QFETCH(QString, locale);
    QFETCH(QString, translation);
    Language lang(locale);
    QCOMPARE(df.localizedValue("Name").toString(), translation);
 }
 #include "test/tst_xdgdesktopfile.moc"
--- a/test/tst_xdgdesktopfile.h
+++ b/test/tst_xdgdesktopfile.h
@ -0,0 +1,35 @@
 /*
 * libqtxdg - An Qt implementation of freedesktop.org xdg specs.
 * Copyright (C) 2016  Luís Pereira <luis.artur.pereira@gmail.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 *
 */
 #ifndef TST_XDGDESKTOPFILE_H
 #define TST_XDGDESKTOPFILE_H
 #include <QObject>
 class tst_xdgdesktopfile : public QObject {
    Q_OBJECT
 private slots:
    void testRead();
    void testReadLocalized();
    void testReadLocalized_data();
 };
 #endif // TST_XDGDESKTOPFILE_H
--- a/util/CMakeLists.txt
+++ b/util/CMakeLists.txt
@ -0,0 +1,26 @@
 include_directories (
    "${CMAKE_PROJECT_DIR}/qtxdg"
    ${CMAKE_CURRENT_BINARY_DIR}
 )
 set(QTXDG_DESKTOP_FILE_START_SRCS
    qtxdg-desktop-file-start.cpp
 )
 add_executable(qtxdg-desktop-file-start
    ${QTXDG_DESKTOP_FILE_START_SRCS}
 )
 target_compile_definitions(qtxdg-desktop-file-start
    PRIVATE "-DQTXDG_VERSION=\"${QTXDG_VERSION_STRING}\""
 )
 target_link_libraries(qtxdg-desktop-file-start
    ${QTXDGX_LIBRARY_NAME}
 )
 install(TARGETS
    qtxdg-desktop-file-start
    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
    COMPONENT Runtime
 )
--- a/util/qtxdg-desktop-file-start.cpp
+++ b/util/qtxdg-desktop-file-start.cpp
@ -0,0 +1,71 @@
 /*
 * libqtxdg - An Qt implementation of freedesktop.org xdg specs
 * Copyright (C) 2016  Luís Pereira <luis.artur.pereira@gmail.com>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor,
 * Boston, MA  02110-1301  USA
 */
 #include <QCoreApplication>
 #include <QCommandLineParser>
 #include <QFileInfo>
 #include <XdgDesktopFile>
 #include <iostream>
 static void printErr(const QString & out)
 {
    std::cerr << qPrintable(out);
 }
 int main(int argc, char *argv[])
 {
    QCoreApplication app(argc, argv);
    QCoreApplication::setApplicationName(QLatin1String("qtxdg-desktop-file-start"));
    QCoreApplication::setApplicationVersion(QLatin1String(QTXDG_VERSION));
    QCommandLineParser parser;
    parser.setApplicationDescription(QLatin1String("QtXdg XdgDesktopFile start Tester"));
    parser.addHelpOption();
    parser.addVersionOption();
    parser.addPositionalArgument(QLatin1String("file [urls...]"), QLatin1String("desktop file to start and it's urls"),QLatin1String("file [urls...]"));
    parser.process(app);
    if (parser.positionalArguments().isEmpty()) {
        parser.showHelp(EXIT_FAILURE);
    }
    QStringList userArgs = parser.positionalArguments();
    const QString userFileName = userArgs.takeFirst();
    const QFileInfo fileInfo(userFileName);
    const QString canonicalFileName = fileInfo.canonicalFilePath();
    if (!fileInfo.exists()) {
        printErr(QString::fromLatin1("File %1 does not exist\n").arg(userFileName));
        return EXIT_FAILURE;
    }
    XdgDesktopFile f;
    const bool valid = f.load(canonicalFileName);
    if (valid) {
        f.startDetached(userArgs);
    } else {
        printErr(QString::fromLatin1("%1 is not a valid .desktop file\n").arg(canonicalFileName));
        return EXIT_FAILURE;
    }
    return EXIT_SUCCESS;
 }
--- a/xdgiconloader/CMakeLists.txt
+++ b/xdgiconloader/CMakeLists.txt
@ -0,0 +1,83 @@
 include_directories(
    "${Qt5Gui_PRIVATE_INCLUDE_DIRS}"
 )
 set(xdgiconloader_PUBLIC_H_FILES
 )
 set(xdgiconloader_PUBLIC_CLASSES
 )
 set(xdgiconloader_PRIVATE_H_FILES
 )
 set(xdgiconloader_CPP_FILES
    xdgiconloader.cpp
 )
 set(xdgiconloader_MOCS
 )
 set(xdgiconloader_PRIVATE_INSTALLABLE_H_FILES
    xdgiconloader_p.h
 )
 add_library(${QTXDGX_ICONLOADER_LIBRARY_NAME} SHARED
    ${xdgiconloader_CPP_FILES}
    ${xdgiconloader_PRIVATE_INSTALLABLE_H_FILES}
 )
 generate_export_header(${QTXDGX_ICONLOADER_LIBRARY_NAME} BASE_NAME XdgIconLoader)
 # Copy public headers (in tree building)
 set(XDGICONLOADER_EXPORT_FILE "xdgiconloader_export.h")
 configure_file(
    "${CMAKE_CURRENT_BINARY_DIR}/${XDGICONLOADER_EXPORT_FILE}"
    "${QTXDGX_INTREE_INCLUDEDIR}/${QTXDGX_ICONLOADER_FILE_NAME}/${XDGICONLOADER_EXPORT_FILE}"
    COPYONLY
 )
 target_include_directories(${QTXDGX_ICONLOADER_LIBRARY_NAME}
    INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_ICONLOADER_FILE_NAME}>"
    INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
    INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_ICONLOADER_FILE_NAME}/${QTXDG_VERSION_STRING}>"
 )
 # include directories and targets for the in tree build
 target_include_directories(${QTXDGX_ICONLOADER_LIBRARY_NAME}
    PUBLIC "$<BUILD_INTERFACE:${QTXDGX_INTREE_INCLUDEDIR}/${QTXDGX_ICONLOADER_FILE_NAME}>"
    PUBLIC "$<BUILD_INTERFACE:${QTXDGX_INTREE_INCLUDEDIR}>"
    PUBLIC "$<BUILD_INTERFACE:${QTXDGX_INTREE_INCLUDEDIR}/${QTXDGX_ICONLOADER_FILE_NAME}/${QTXDG_VERSION_STRING}>"
 )
 target_link_libraries(${QTXDGX_ICONLOADER_LIBRARY_NAME}
    PUBLIC
        Qt5::Gui
        Qt5::Svg
 )
 set_target_properties(${QTXDGX_ICONLOADER_LIBRARY_NAME}
    PROPERTIES
        VERSION   ${QTXDG_VERSION_STRING}
        SOVERSION ${QTXDG_MAJOR_VERSION}
 )
 export(TARGETS ${QTXDGX_ICONLOADER_LIBRARY_NAME} FILE "${CMAKE_BINARY_DIR}/${QTXDGX_ICONLOADER_FILE_NAME}-targets.cmake")
 install(TARGETS
    ${QTXDGX_ICONLOADER_LIBRARY_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}"
    EXPORT "${QTXDGX_ICONLOADER_FILE_NAME}-targets"
    COMPONENT Runtime
 )
 install(FILES
    ${xdgiconloader_PRIVATE_INSTALLABLE_H_FILES}
    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_ICONLOADER_FILE_NAME}/${QTXDG_VERSION_STRING}/private/xdgiconloader"
    COMPONENT Devel
 )
 install(FILES
    "${QTXDGX_INTREE_INCLUDEDIR}/${QTXDGX_ICONLOADER_FILE_NAME}/${XDGICONLOADER_EXPORT_FILE}"
    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_ICONLOADER_FILE_NAME}"
 )
--- a/xdgiconloader/xdgiconloader.cpp
+++ b/xdgiconloader/xdgiconloader.cpp
@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 #ifndef QT_NO_ICON
-#include "qiconloader_p.h"
+#include "xdgiconloader_p.h"
 #include <private/qguiapplication_p.h>
 #include <private/qicon_p.h>
@ -42,12 +42,11 @@
 #include <QtGui/QIconEngine>
 #include <QtGui/QPalette>
 #include <QtCore/QList>
 #include <QtCore/QHash>
 #include <QtCore/QDir>
 #include <QtCore/QSettings>
 #include <QtGui/QPainter>
-#ifdef Q_WS_MAC
+#ifdef Q_DEAD_CODE_FROM_QT4_MAC
 #include <private/qt_cocoa_helpers_mac_p.h>
 #endif
@ -55,9 +54,8 @@
 //QT_BEGIN_NAMESPACE
 namespace QtXdg {
-Q_GLOBAL_STATIC(QIconLoader, iconLoaderInstance)
+Q_GLOBAL_STATIC(XdgIconLoader, iconLoaderInstance)
 /* Theme to use in last resort, if the theme does not have the icon, neither the parents  */
 static QString fallbackTheme()
@ -67,17 +65,14 @@ static QString fallbackTheme()
        if (themeHint.isValid())
            return themeHint.toString();
    }
-    return QString("hicolor");
+    return QLatin1String("hicolor");
 }
-QIconLoader::QIconLoader() :
+XdgIconLoader::XdgIconLoader() :
        m_themeKey(1), m_supportsSvg(false), m_initialized(false)
 {
 }
 // We lazily initialize the loader to make static icons
 // work. Though we do not officially support this.
 static inline QString systemThemeName()
 {
    if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) {
@ -102,7 +97,7 @@ static inline QStringList systemIconSearchPaths()
 //extern QFactoryLoader *qt_iconEngineFactoryLoader(); // qicon.cpp
 #endif
-void QIconLoader::ensureInitialized()
+void XdgIconLoader::ensureInitialized()
 {
    if (!m_initialized) {
        m_initialized = true;
@ -120,7 +115,7 @@ void QIconLoader::ensureInitialized()
    }
 }
-QIconLoader *QIconLoader::instance()
+XdgIconLoader *XdgIconLoader::instance()
 {
   iconLoaderInstance()->ensureInitialized();
   return iconLoaderInstance();
@ -128,7 +123,7 @@ QIconLoader *QIconLoader::instance()
 // Queries the system theme and invalidates existing
 // icons if the theme has changed.
-void QIconLoader::updateSystemTheme()
+void XdgIconLoader::updateSystemTheme()
 {
    // Only change if this is not explicitly set by the user
    if (m_userTheme.isEmpty()) {
@ -142,20 +137,20 @@ void QIconLoader::updateSystemTheme()
    }
 }
-void QIconLoader::setThemeName(const QString &themeName)
+void XdgIconLoader::setThemeName(const QString &themeName)
 {
    m_userTheme = themeName;
    invalidateKey();
 }
-void QIconLoader::setThemeSearchPath(const QStringList &searchPaths)
+void XdgIconLoader::setThemeSearchPath(const QStringList &searchPaths)
 {
    m_iconDirs = searchPaths;
    themeList.clear();
    invalidateKey();
 }
-QStringList QIconLoader::themeSearchPaths() const
+QStringList XdgIconLoader::themeSearchPaths() const
 {
    if (m_iconDirs.isEmpty()) {
        m_iconDirs = systemIconSearchPaths();
@ -165,6 +160,141 @@ QStringList QIconLoader::themeSearchPaths() const
    return m_iconDirs;
 }
 /*!
    \class QIconCacheGtkReader
    \internal
    Helper class that reads and looks up into the icon-theme.cache generated with
    gtk-update-icon-cache. If at any point we detect a corruption in the file
    (because the offsets point at wrong locations for example), the reader
    is marked as invalid.
 */
 class QIconCacheGtkReader
 {
 public:
    explicit QIconCacheGtkReader(const QString &themeDir);
    QVector<const char *> lookup(const QString &);
    bool isValid() const { return m_isValid; }
 private:
    QFile m_file;
    const unsigned char *m_data;
    quint64 m_size;
    bool m_isValid;
    quint16 read16(uint offset)
    {
        if (offset > m_size - 2 || (offset & 0x1)) {
            m_isValid = false;
            return 0;
        }
        return m_data[offset+1] | m_data[offset] << 8;
    }
    quint32 read32(uint offset)
    {
        if (offset > m_size - 4 || (offset & 0x3)) {
            m_isValid = false;
            return 0;
        }
        return m_data[offset+3] | m_data[offset+2] << 8
            | m_data[offset+1] << 16 | m_data[offset] << 24;
    }
 };
 QIconCacheGtkReader::QIconCacheGtkReader(const QString &dirName)
    : m_isValid(false)
 {
    QFileInfo info(dirName + QLatin1Literal("/icon-theme.cache"));
    if (!info.exists() || info.lastModified() < QFileInfo(dirName).lastModified())
        return;
    m_file.setFileName(info.absoluteFilePath());
    if (!m_file.open(QFile::ReadOnly))
        return;
    m_size = m_file.size();
    m_data = m_file.map(0, m_size);
    if (!m_data)
        return;
    if (read16(0) != 1) // VERSION_MAJOR
        return;
    m_isValid = true;
    // Check that all the directories are older than the cache
    auto lastModified = info.lastModified();
    quint32 dirListOffset = read32(8);
    quint32 dirListLen = read32(dirListOffset);
    for (uint i = 0; i < dirListLen; ++i) {
        quint32 offset = read32(dirListOffset + 4 + 4 * i);
        if (!m_isValid || offset >= m_size || lastModified < QFileInfo(dirName + QLatin1Char('/')
                + QString::fromUtf8(reinterpret_cast<const char*>(m_data + offset))).lastModified()) {
            m_isValid = false;
            return;
        }
    }
 }
 static quint32 icon_name_hash(const char *p)
 {
    quint32 h = static_cast<signed char>(*p);
    for (p += 1; *p != '\0'; p++)
        h = (h << 5) - h + *p;
    return h;
 }
 /*! \internal
    lookup the icon name and return the list of subdirectories in which an icon
    with this name is present. The char* are pointers to the mapped data.
    For example, this would return { "32x32/apps", "24x24/apps" , ... }
 */
 QVector<const char *> QIconCacheGtkReader::lookup(const QString &name)
 {
    QVector<const char *> ret;
    if (!isValid())
        return ret;
    QByteArray nameUtf8 = name.toUtf8();
    quint32 hash = icon_name_hash(nameUtf8.data());
    quint32 hashOffset = read32(4);
    quint32 hashBucketCount = read32(hashOffset);
    if (!isValid() || hashBucketCount == 0) {
        m_isValid = false;
        return ret;
    }
    quint32 bucketIndex = hash % hashBucketCount;
    quint32 bucketOffset = read32(hashOffset + 4 + bucketIndex * 4);
    while (bucketOffset > 0 && bucketOffset <= m_size - 12) {
        quint32 nameOff = read32(bucketOffset + 4);
        if (nameOff < m_size && strcmp(reinterpret_cast<const char*>(m_data + nameOff), nameUtf8.constData()) == 0) {
            quint32 dirListOffset = read32(8);
            quint32 dirListLen = read32(dirListOffset);
            quint32 listOffset = read32(bucketOffset+8);
            quint32 listLen = read32(listOffset);
            if (!m_isValid || listOffset + 4 + 8 * listLen > m_size) {
                m_isValid = false;
                return ret;
            }
            ret.reserve(listLen);
            for (uint j = 0; j < listLen && m_isValid; ++j) {
                quint32 dirIndex = read16(listOffset + 4 + 8 * j);
                quint32 o = read32(dirListOffset + 4 + dirIndex*4);
                if (!m_isValid || dirIndex >= dirListLen || o >= m_size) {
                    m_isValid = false;
                    return ret;
                }
                ret.append(reinterpret_cast<const char*>(m_data) + o);
            }
            return ret;
        }
        bucketOffset = read32(bucketOffset);
    }
    return ret;
 }
 QIconTheme::QIconTheme(const QString &themeName)
        : m_valid(false)
 {
@ -174,19 +304,17 @@ QIconTheme::QIconTheme(const QString &themeName)
    for ( int i = 0 ; i < iconDirs.size() ; ++i) {
        QDir iconDir(iconDirs[i]);
        QString themeDir = iconDir.path() + QLatin1Char('/') + themeName;
-        themeIndex.setFileName(themeDir + QLatin1String("/index.theme"));
+        QFileInfo themeDirInfo(themeDir);
        if (themeIndex.exists()) {
            m_contentDirs << themeDir;
            m_valid = true;
-            QStringList themeSearchPaths = QIcon::themeSearchPaths();
+        if (themeDirInfo.isDir()) {
-            foreach (QString path, themeSearchPaths)
+            m_contentDirs << themeDir;
-            {
+            m_gtkCaches << QSharedPointer<QIconCacheGtkReader>::create(themeDir);
-                if (!path.startsWith(':') && QFileInfo(path).isDir())
+        }
                    m_contentDirs.append(path + QLatin1Char('/') + themeName);
            }
-            break;
+        if (!m_valid) {
            themeIndex.setFileName(themeDir + QLatin1String("/index.theme"));
            if (themeIndex.exists())
                m_valid = true;
        }
    }
 #ifndef QT_NO_SETTINGS
@ -201,18 +329,18 @@ QIconTheme::QIconTheme(const QString &themeName)
                // slashes in key names, hence we have to cheat
                if (int size = indexReader.value(key).toInt()) {
                    QString directoryKey = key.left(key.size() - 5);
-                    QIconDirInfo dirInfo(directoryKey);
+                    XdgIconDirInfo dirInfo(directoryKey);
                    dirInfo.size = size;
                    QString type = indexReader.value(directoryKey +
                                                     QLatin1String("/Type")
                                                     ).toString();
                    if (type == QLatin1String("Fixed"))
-                        dirInfo.type = QIconDirInfo::Fixed;
+                        dirInfo.type = XdgIconDirInfo::Fixed;
                    else if (type == QLatin1String("Scalable"))
-                        dirInfo.type = QIconDirInfo::Scalable;
+                        dirInfo.type = XdgIconDirInfo::Scalable;
                    else
-                        dirInfo.type = QIconDirInfo::Threshold;
+                        dirInfo.type = XdgIconDirInfo::Threshold;
                    dirInfo.threshold = indexReader.value(directoryKey +
                                                        QLatin1String("/Threshold"),
@ -249,7 +377,7 @@ QIconTheme::QIconTheme(const QString &themeName)
 #endif //QT_NO_SETTINGS
 }
-QThemeIconInfo QIconLoader::findIconHelper(const QString &themeName,
+QThemeIconInfo XdgIconLoader::findIconHelper(const QString &themeName,
                                 const QString &iconName,
                                 QStringList &visited) const
 {
@ -271,7 +399,6 @@ QThemeIconInfo QIconLoader::findIconHelper(const QString &themeName,
    }
    const QStringList contentDirs = theme.contentDirs();
    const QVector<QIconDirInfo> subDirs = theme.keyList();
    const QString svgext(QLatin1String(".svg"));
    const QString pngext(QLatin1String(".png"));
@ -288,9 +415,32 @@ QThemeIconInfo QIconLoader::findIconHelper(const QString &themeName,
        // Add all relevant files
        for (int i = 0; i < contentDirs.size(); ++i) {
            QVector<XdgIconDirInfo> subDirs = theme.keyList();
            // Try to reduce the amount of subDirs by looking in the GTK+ cache in order to save
            // a massive amount of file stat (especially if the icon is not there)
            auto cache = theme.m_gtkCaches.at(i);
            if (cache->isValid()) {
                auto result = cache->lookup(iconNameFallback);
                if (cache->isValid()) {
                    const QVector<XdgIconDirInfo> subDirsCopy = subDirs;
                    subDirs.clear();
                    subDirs.reserve(result.count());
                    foreach (const char *s, result) {
                        QString path = QString::fromUtf8(s);
                        auto it = std::find_if(subDirsCopy.cbegin(), subDirsCopy.cend(),
                                               [&](const XdgIconDirInfo &info) {
                                                   return info.path == path; } );
                        if (it != subDirsCopy.cend()) {
                            subDirs.append(*it);
                        }
                    }
                }
            }
            QString contentDir = contentDirs.at(i) + QLatin1Char('/');
            for (int j = 0; j < subDirs.size() ; ++j) {
-                const QIconDirInfo &dirInfo = subDirs.at(j);
+                const XdgIconDirInfo &dirInfo = subDirs.at(j);
                QString subdir = dirInfo.path;
                QDir currentDir(contentDir + subdir);
                if (currentDir.exists(pngIconName)) {
@ -390,7 +540,7 @@ QThemeIconInfo QIconLoader::findIconHelper(const QString &themeName,
        const QString pixmaps(QLatin1String("/usr/share/pixmaps"));
        const QDir currentDir(pixmaps);
-        const QIconDirInfo dirInfo(pixmaps);
+        const XdgIconDirInfo dirInfo(pixmaps);
        if (currentDir.exists(iconName + pngext)) {
            PixmapEntry *iconEntry = new PixmapEntry;
            iconEntry->dir = dirInfo;
@ -418,7 +568,7 @@ QThemeIconInfo QIconLoader::findIconHelper(const QString &themeName,
    return info;
 }
-QThemeIconInfo QIconLoader::loadIcon(const QString &name) const
+QThemeIconInfo XdgIconLoader::loadIcon(const QString &name) const
 {
    if (!themeName().isEmpty()) {
        QStringList visited;
@ -432,63 +582,63 @@ QThemeIconInfo QIconLoader::loadIcon(const QString &name) const
 // -------- Icon Loader Engine -------- //
-QIconLoaderEngineFixed::QIconLoaderEngineFixed(const QString& iconName)
+XdgIconLoaderEngine::XdgIconLoaderEngine(const QString& iconName)
        : m_iconName(iconName), m_key(0)
 {
 }
-QIconLoaderEngineFixed::~QIconLoaderEngineFixed()
+XdgIconLoaderEngine::~XdgIconLoaderEngine()
 {
    qDeleteAll(m_info.entries);
 }
-QIconLoaderEngineFixed::QIconLoaderEngineFixed(const QIconLoaderEngineFixed &other)
+XdgIconLoaderEngine::XdgIconLoaderEngine(const XdgIconLoaderEngine &other)
        : QIconEngine(other),
        m_iconName(other.m_iconName),
        m_key(0)
 {
 }
-QIconEngine *QIconLoaderEngineFixed::clone() const
+QIconEngine *XdgIconLoaderEngine::clone() const
 {
-    return new QIconLoaderEngineFixed(*this);
+    return new XdgIconLoaderEngine(*this);
 }
-bool QIconLoaderEngineFixed::read(QDataStream &in) {
+bool XdgIconLoaderEngine::read(QDataStream &in) {
    in >> m_iconName;
    return true;
 }
-bool QIconLoaderEngineFixed::write(QDataStream &out) const
+bool XdgIconLoaderEngine::write(QDataStream &out) const
 {
    out << m_iconName;
    return true;
 }
-bool QIconLoaderEngineFixed::hasIcon() const
+bool XdgIconLoaderEngine::hasIcon() const
 {
    return !(m_info.entries.isEmpty());
 }
 // Lazily load the icon
-void QIconLoaderEngineFixed::ensureLoaded()
+void XdgIconLoaderEngine::ensureLoaded()
 {
-    if (!(QIconLoader::instance()->themeKey() == m_key)) {
+    if (!(XdgIconLoader::instance()->themeKey() == m_key)) {
        qDeleteAll(m_info.entries);
        m_info.entries.clear();
        m_info.iconName.clear();
        Q_ASSERT(m_info.entries.size() == 0);
-        m_info = QIconLoader::instance()->loadIcon(m_iconName);
+        m_info = XdgIconLoader::instance()->loadIcon(m_iconName);
-        m_key = QIconLoader::instance()->themeKey();
+        m_key = XdgIconLoader::instance()->themeKey();
    }
 }
-void QIconLoaderEngineFixed::paint(QPainter *painter, const QRect &rect,
+void XdgIconLoaderEngine::paint(QPainter *painter, const QRect &rect,
                             QIcon::Mode mode, QIcon::State state)
 {
    QSize pixmapSize = rect.size();
-#if defined(Q_WS_MAC)
+#if defined(Q_DEAD_CODE_FROM_QT4_MAC)
    pixmapSize *= qt_mac_get_scalefactor();
 #endif
    painter->drawPixmap(rect, pixmap(pixmapSize, mode, state));
@ -498,16 +648,16 @@ void QIconLoaderEngineFixed::paint(QPainter *painter, const QRect &rect,
 * This algorithm is defined by the freedesktop spec:
 * http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
 */
-static bool directoryMatchesSize(const QIconDirInfo &dir, int iconsize)
+static bool directoryMatchesSize(const XdgIconDirInfo &dir, int iconsize)
 {
-    if (dir.type == QIconDirInfo::Fixed) {
+    if (dir.type == XdgIconDirInfo::Fixed) {
        return dir.size == iconsize;
-    } else if (dir.type == QIconDirInfo::Scalable) {
+    } else if (dir.type == XdgIconDirInfo::Scalable) {
-        return dir.size <= dir.maxSize &&
+        return iconsize <= dir.maxSize &&
                iconsize >= dir.minSize;
-    } else if (dir.type == QIconDirInfo::Threshold) {
+    } else if (dir.type == XdgIconDirInfo::Threshold) {
        return iconsize >= dir.size - dir.threshold &&
                iconsize <= dir.size + dir.threshold;
    }
@ -520,12 +670,12 @@ static bool directoryMatchesSize(const QIconDirInfo &dir, int iconsize)
 * This algorithm is defined by the freedesktop spec:
 * http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
 */
-static int directorySizeDistance(const QIconDirInfo &dir, int iconsize)
+static int directorySizeDistance(const XdgIconDirInfo &dir, int iconsize)
 {
-    if (dir.type == QIconDirInfo::Fixed) {
+    if (dir.type == XdgIconDirInfo::Fixed) {
        return qAbs(dir.size - iconsize);
-    } else if (dir.type == QIconDirInfo::Scalable) {
+    } else if (dir.type == XdgIconDirInfo::Scalable) {
        if (iconsize < dir.minSize)
            return dir.minSize - iconsize;
        else if (iconsize > dir.maxSize)
@ -533,7 +683,7 @@ static int directorySizeDistance(const QIconDirInfo &dir, int iconsize)
        else
            return 0;
-    } else if (dir.type == QIconDirInfo::Threshold) {
+    } else if (dir.type == XdgIconDirInfo::Threshold) {
        if (iconsize < dir.size - dir.threshold)
            return dir.minSize - iconsize;
        else if (iconsize > dir.size + dir.threshold)
@ -545,7 +695,7 @@ static int directorySizeDistance(const QIconDirInfo &dir, int iconsize)
    return INT_MAX;
 }
-QIconLoaderEngineEntry *QIconLoaderEngineFixed::entryForSize(const QSize &size)
+XdgIconLoaderEngineEntry *XdgIconLoaderEngine::entryForSize(const QSize &size)
 {
    int iconsize = qMin(size.width(), size.height());
@ -556,7 +706,7 @@ QIconLoaderEngineEntry *QIconLoaderEngineFixed::entryForSize(const QSize &size)
    // Search for exact matches first
    for (int i = 0; i < numEntries; ++i) {
-        QIconLoaderEngineEntry *entry = m_info.entries.at(i);
+        XdgIconLoaderEngineEntry *entry = m_info.entries.at(i);
        if (directoryMatchesSize(entry->dir, iconsize)) {
            return entry;
        }
@ -564,9 +714,9 @@ QIconLoaderEngineEntry *QIconLoaderEngineFixed::entryForSize(const QSize &size)
    // Find the minimum distance icon
    int minimalSize = INT_MAX;
-    QIconLoaderEngineEntry *closestMatch = 0;
+    XdgIconLoaderEngineEntry *closestMatch = 0;
    for (int i = 0; i < numEntries; ++i) {
-        QIconLoaderEngineEntry *entry = m_info.entries.at(i);
+        XdgIconLoaderEngineEntry *entry = m_info.entries.at(i);
        int distance = directorySizeDistance(entry->dir, iconsize);
        if (distance < minimalSize) {
            minimalSize  = distance;
@ -582,18 +732,27 @@ QIconLoaderEngineEntry *QIconLoaderEngineFixed::entryForSize(const QSize &size)
 * we can never return a bigger size than the requested size.
 *
 */
-QSize QIconLoaderEngineFixed::actualSize(const QSize &size, QIcon::Mode mode,
+QSize XdgIconLoaderEngine::actualSize(const QSize &size, QIcon::Mode mode,
                                   QIcon::State state)
 {
    ensureLoaded();
-    QIconLoaderEngineEntry *entry = entryForSize(size);
+    XdgIconLoaderEngineEntry *entry = entryForSize(size);
    if (entry) {
-        const QIconDirInfo &dir = entry->dir;
+        const XdgIconDirInfo &dir = entry->dir;
-        if (dir.type == QIconDirInfo::Scalable)
+        if (dir.type == XdgIconDirInfo::Scalable || dynamic_cast<ScalableEntry *>(entry))
            return size;
        else {
-            int result = qMin<int>(dir.size, qMin(size.width(), size.height()));
+            int dir_size = dir.size;
            //Note: fallback for directories that don't have its content size defined
            //  -> get the actual size based on the image if possible
            PixmapEntry * pix_e;
            if (0 == dir_size && nullptr != (pix_e = dynamic_cast<PixmapEntry *>(entry)))
            {
                QSize pix_size = pix_e->basePixmap.size();
                dir_size = qMin(pix_size.width(), pix_size.height());
            }
            int result = qMin(dir_size, qMin(size.width(), size.height()));
            return QSize(result, result);
        }
    }
@ -644,24 +803,24 @@ QPixmap ScalableEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State
    return svgIcon.pixmap(size, mode, state);
 }
-QPixmap QIconLoaderEngineFixed::pixmap(const QSize &size, QIcon::Mode mode,
+QPixmap XdgIconLoaderEngine::pixmap(const QSize &size, QIcon::Mode mode,
                                 QIcon::State state)
 {
    ensureLoaded();
-    QIconLoaderEngineEntry *entry = entryForSize(size);
+    XdgIconLoaderEngineEntry *entry = entryForSize(size);
    if (entry)
        return entry->pixmap(size, mode, state);
    return QPixmap();
 }
-QString QIconLoaderEngineFixed::key() const
+QString XdgIconLoaderEngine::key() const
 {
-    return QLatin1String("QIconLoaderEngineFixed");
+    return QLatin1String("XdgIconLoaderEngine");
 }
-void QIconLoaderEngineFixed::virtual_hook(int id, void *data)
+void XdgIconLoaderEngine::virtual_hook(int id, void *data)
 {
    ensureLoaded();
@ -685,15 +844,21 @@ void QIconLoaderEngineFixed::virtual_hook(int id, void *data)
    case QIconEngine::IconNameHook:
        {
            QString &name = *reinterpret_cast<QString*>(data);
-            name = m_iconName;
+            name = m_info.iconName;
        }
        break;
 #if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
    case QIconEngine::IsNullHook:
        {
            *reinterpret_cast<bool*>(data) = m_info.entries.isEmpty();
        }
        break;
 #endif
    default:
        QIconEngine::virtual_hook(id, data);
    }
 }
 } // QtXdg
 //QT_END_NAMESPACE
--- a/xdgiconloader/xdgiconloader_p.h
+++ b/xdgiconloader/xdgiconloader_p.h
@ -48,6 +48,8 @@
 // We mean it.
 //
 #include <xdgiconloader_export.h>
 #include <QtGui/QIcon>
 #include <QtGui/QIconEngine>
 #include <QtGui/QPixmapCache>
@ -59,14 +61,12 @@
 //QT_BEGIN_NAMESPACE
-namespace QtXdg {
+class XdgIconLoader;
 class QIconLoader;
-struct QIconDirInfo
+struct XdgIconDirInfo
 {
    enum Type { Fixed, Scalable, Threshold };
-    QIconDirInfo(const QString &_path = QString()) :
+    XdgIconDirInfo(const QString &_path = QString()) :
            path(_path),
            size(0),
            maxSize(0),
@ -78,34 +78,34 @@ struct QIconDirInfo
    short maxSize;
    short minSize;
    short threshold;
-    Type type : 4;
+    Type type;
 };
-class QIconLoaderEngineEntry
+class XdgIconLoaderEngineEntry
 {
 public:
-    virtual ~QIconLoaderEngineEntry() {}
+    virtual ~XdgIconLoaderEngineEntry() {}
    virtual QPixmap pixmap(const QSize &size,
                           QIcon::Mode mode,
                           QIcon::State state) = 0;
    QString filename;
-    QIconDirInfo dir;
+    XdgIconDirInfo dir;
    static int count;
 };
-struct ScalableEntry : public QIconLoaderEngineEntry
+struct ScalableEntry : public XdgIconLoaderEngineEntry
 {
    QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
    QIcon svgIcon;
 };
-struct PixmapEntry : public QIconLoaderEngineEntry
+struct PixmapEntry : public XdgIconLoaderEngineEntry
 {
    QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
    QPixmap basePixmap;
 };
-typedef QList<QIconLoaderEngineEntry*> QThemeIconEntries;
+typedef QList<XdgIconLoaderEngineEntry*> QThemeIconEntries;
 struct QThemeIconInfo
 {
@ -114,11 +114,11 @@ struct QThemeIconInfo
 };
 //class QIconLoaderEngine : public QIconEngine
-class QIconLoaderEngineFixed : public QIconEngine
+class XDGICONLOADER_EXPORT XdgIconLoaderEngine : public QIconEngine
 {
 public:
-    QIconLoaderEngineFixed(const QString& iconName = QString());
+    XdgIconLoaderEngine(const QString& iconName = QString());
-    ~QIconLoaderEngineFixed();
+    ~XdgIconLoaderEngine();
    void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state);
    QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state);
@ -132,36 +132,39 @@ private:
    bool hasIcon() const;
    void ensureLoaded();
    void virtual_hook(int id, void *data);
-    QIconLoaderEngineEntry *entryForSize(const QSize &size);
+    XdgIconLoaderEngineEntry *entryForSize(const QSize &size);
-    QIconLoaderEngineFixed(const QIconLoaderEngineFixed &other);
+    XdgIconLoaderEngine(const XdgIconLoaderEngine &other);
    QThemeIconInfo m_info;
    QString m_iconName;
    uint m_key;
-    friend class QIconLoader;
+    friend class XdgIconLoader;
 };
 class QIconCacheGtkReader;
 class QIconTheme
 {
 public:
    QIconTheme(const QString &name);
    QIconTheme() : m_valid(false) {}
    QStringList parents() { return m_parents; }
-    QVector <QIconDirInfo> keyList() { return m_keyList; }
+    QVector <XdgIconDirInfo> keyList() { return m_keyList; }
    QStringList contentDirs() { return m_contentDirs; }
    bool isValid() { return m_valid; }
 private:
    QStringList m_contentDirs;
-    QVector <QIconDirInfo> m_keyList;
+    QVector <XdgIconDirInfo> m_keyList;
    QStringList m_parents;
    bool m_valid;
 public:
    QVector<QSharedPointer<QIconCacheGtkReader>> m_gtkCaches;
 };
-class Q_GUI_EXPORT QIconLoader
+class XDGICONLOADER_EXPORT XdgIconLoader
 {
 public:
-    QIconLoader();
+    XdgIconLoader();
    QThemeIconInfo loadIcon(const QString &iconName) const;
    uint themeKey() const { return m_themeKey; }
@ -170,11 +173,12 @@ public:
    QIconTheme theme() { return themeList.value(themeName()); }
    void setThemeSearchPath(const QStringList &searchPaths);
    QStringList themeSearchPaths() const;
-    QIconDirInfo dirInfo(int dirindex);
+    XdgIconDirInfo dirInfo(int dirindex);
-    static QIconLoader *instance();
+    static XdgIconLoader *instance();
    void updateSystemTheme();
    void invalidateKey() { m_themeKey++; }
    void ensureInitialized();
    bool hasUserTheme() const { return !m_userTheme.isEmpty(); }
 private:
    QThemeIconInfo findIconHelper(const QString &themeName,
@ -190,11 +194,10 @@ private:
    mutable QHash <QString, QIconTheme> themeList;
 };
 } // QtXdg
 // Note: class template specialization of 'QTypeInfo' must occur at
 //       global scope
-Q_DECLARE_TYPEINFO(QtXdg::QIconDirInfo, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(XdgIconDirInfo, Q_MOVABLE_TYPE);
 //QT_END_NAMESPACE