← Back to branch summary

~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

« back to all changes in this revision

Viewing changes to tests/unit/custom_qpa/qcustomintegration.cpp

  • Committer: Tarmac
  • Author(s): Loïc Molinari
  • Date: 2016-09-12 16:04:18 UTC
  • mfrom: (2090.1.7 uitk-test)
  • Revision ID: tarmac-20160912160418-3murc3kypk2jwamk
Fixed, cleaned up and standardised header inclusions.

Apart from the clean up and the readability improvements, this fixes a bunch of broken private header inclusions (#include "foo_p.h" in private headers instead of "private/foo_p.h" or better <Project/private/foo_p.h>), now all the private headers of the UITK can be included by the users withour compilation issues. It also removes a bunch of direct includes from sources and a few INCLUDEPATHs hacks.

See the CODING file for more details.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit/custom_qpa/qcustomintegration.cpp
32
32
****************************************************************************/
33
33
 
34
34
#include "qcustomintegration.h"
35
 
#include "qcustombackingstore.h"
36
35
 
 
36
#include <QtGui/qpa/qplatformfontdatabase.h>
 
37
#include <QtGui/qpa/qplatformnativeinterface.h>
 
38
#include <QtGui/qpa/qplatformwindow.h>
37
39
#include <QtGui/private/qguiapplication_p.h>
38
 
#include <qpa/qplatformwindow.h>
39
 
#include <qpa/qplatformfontdatabase.h>
40
 
#include <qpa/qplatformnativeinterface.h>
41
 
 
42
40
#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
43
41
 
 
42
#include "qcustombackingstore.h"
 
43
 
44
44
static const char devicePixelRatioEnvironmentVariable[] = "QT_DEVICE_PIXEL_RATIO";
45
45
 
46
46
class QCustomNativeInterface : public QPlatformNativeInterface
144
144
    return static_cast<QCustomIntegration *>(QGuiApplicationPrivate::platformIntegration());
145
145
}
146
146
 
147
 
#include "qcustomintegration.moc"
 
 
b'\\ No newline at end of file'
 
147
#include "qcustomintegration.moc"