diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-12-04 12:48:56 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-12-04 12:49:37 +0200 |
| commit | b5eea82532059738a7da751222ebef68539508f1 (patch) | |
| tree | c6dad2476eed9ffb29076a51c928baf2ce500c10 /src/displaysettings | |
| parent | 61e9e8c83e817b3692beae03bd8e683d247207b0 (diff) | |
| parent | 724309463d63480ca755d5f309825a9dd078d012 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
* origin/5.9:
Fix compilation with namespaces
Import only available modules
Update license headers
Verify that Qtdbus module is available
tests: add tests.pro for CI
Doc: Bump version to 5.9.3
Conflicts:
.qmake.conf
Change-Id: I83f4f8a507586d50423d0a2bb1dd4b69557b38ed
Diffstat (limited to 'src/displaysettings')
| -rw-r--r-- | src/displaysettings/displaysettings.cpp | 4 | ||||
| -rw-r--r-- | src/displaysettings/displaysettings_p.cpp | 4 | ||||
| -rw-r--r-- | src/displaysettings/displaysettings_p.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/displaysettings/displaysettings.cpp b/src/displaysettings/displaysettings.cpp index 0ab5177..6cadfc2 100644 --- a/src/displaysettings/displaysettings.cpp +++ b/src/displaysettings/displaysettings.cpp @@ -29,6 +29,8 @@ #include "displaysettings.h" #include "displaysettings_p.h" +QT_BEGIN_NAMESPACE + DisplaySettings::DisplaySettings(QObject *parent) : QObject(parent) ,d_ptr(new DisplaySettingsPrivate(this)) @@ -88,3 +90,5 @@ void DisplaySettings::setPhysicalScreenSizeOverride(bool enable) Q_D(DisplaySettings); d->setPhysicalScreenSizeOverride(enable); } + +QT_END_NAMESPACE diff --git a/src/displaysettings/displaysettings_p.cpp b/src/displaysettings/displaysettings_p.cpp index c7bbc9a..890d868 100644 --- a/src/displaysettings/displaysettings_p.cpp +++ b/src/displaysettings/displaysettings_p.cpp @@ -30,6 +30,8 @@ #include <QDirIterator> #include "displaysettings_p.h" +QT_BEGIN_NAMESPACE + DisplaySettingsPrivate::DisplaySettingsPrivate(DisplaySettings *qq) :q_ptr(qq) ,m_brightness(255) @@ -238,3 +240,5 @@ void PhysicalScreenSize::setEnabled(bool enable) // Rewrite appcontroller.conf with or without the physical width/height lines. write(enable); } + +QT_END_NAMESPACE diff --git a/src/displaysettings/displaysettings_p.h b/src/displaysettings/displaysettings_p.h index 329ed81..7e1d9cd 100644 --- a/src/displaysettings/displaysettings_p.h +++ b/src/displaysettings/displaysettings_p.h @@ -43,6 +43,8 @@ #include <QTimer> #include "displaysettings.h" +QT_BEGIN_NAMESPACE + class PhysicalScreenSize : public QObject { Q_OBJECT @@ -101,4 +103,6 @@ private: PhysicalScreenSize *m_physScreenSize; }; +QT_END_NAMESPACE + #endif // DISPLAYSETTINGSPRIVATE_H |