diff options
author | Weblate <noreply@weblate.org> | 2017-12-27 22:24:48 +0000 |
---|---|---|
committer | Weblate <noreply@weblate.org> | 2017-12-27 22:24:48 +0000 |
commit | 107851adab5f573e331150847b48f499edbcfbb9 (patch) | |
tree | 28aac1799650b0c51530130817e63e4c6381127a /src-qt5/core/lumina-desktop-unified/global-includes.h | |
parent | Translated using Weblate (Danish) (diff) | |
parent | Shifted from a custom QWidget to a subclass of QGraphicalView and connected i... (diff) | |
download | lumina-107851adab5f573e331150847b48f499edbcfbb9.tar.gz lumina-107851adab5f573e331150847b48f499edbcfbb9.tar.bz2 lumina-107851adab5f573e331150847b48f499edbcfbb9.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified/global-includes.h')
-rw-r--r-- | src-qt5/core/lumina-desktop-unified/global-includes.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/global-includes.h b/src-qt5/core/lumina-desktop-unified/global-includes.h index 40987ad4..fbc3c4f7 100644 --- a/src-qt5/core/lumina-desktop-unified/global-includes.h +++ b/src-qt5/core/lumina-desktop-unified/global-includes.h @@ -59,10 +59,6 @@ #include <QQmlEngine> #include <QQuickImageProvider> -// C++ Backend classes for QML interface -#include <RootDesktopObject.h> -#include <ScreenObject.h> - // libLumina includes #include <LuminaX11.h> #include <LuminaXDG.h> @@ -80,6 +76,9 @@ #include <LIconCache.h> #include <LFileInfo.h> +// C++ Backend classes for QML interface +#include <RootDesktopObject.h> +#include <ScreenObject.h> //Setup any global defines (no classes or global objects: use "global-objects.h" for that) |