diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-07-17 09:34:35 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2017-07-17 09:59:21 +0000 |
| commit | 32c236f5e067f73bcc1140d75e7dd79c4db3b90a (patch) | |
| tree | ea754501538a810cb6067ad3951cf23c689c02c0 /src/main-lib/main.h | |
| parent | 887ccc41cbf2037252035976dd6d70c31794f392 (diff) | |
| download | qtapplicationmanager-32c236f5e067f73bcc1140d75e7dd79c4db3b90a.tar.gz | |
Fix qml autotest
debugApplication is supposed to return an error in the single-process
case. This is now tested.
Refactored "Main" to properly set the buildConfig for the testrunner.
Change-Id: If0af720a85345258246dc9b09182c4fffab894f6
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'src/main-lib/main.h')
| -rw-r--r-- | src/main-lib/main.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main-lib/main.h b/src/main-lib/main.h index 587ab6db..ba1aa800 100644 --- a/src/main-lib/main.h +++ b/src/main-lib/main.h @@ -88,6 +88,8 @@ public: bool isSingleProcessMode() const; void setup(const DefaultConfiguration *cfg) Q_DECL_NOEXCEPT_EXPR(false); + void loadQml(bool loadDummyData) Q_DECL_NOEXCEPT_EXPR(false); + void showWindow(bool showFullscreen); void shutDown(); @@ -117,8 +119,6 @@ protected: void setupWindowTitle(const QString &title, const QString &iconPath); void setupWindowManager(const QString &waylandSocketName, bool slowAnimations, bool uiWatchdog); - void loadQml(bool loadDummyData) Q_DECL_NOEXCEPT_EXPR(false); - void showWindow(bool showFullscreen); void setupShellServer(const QString &telnetAddress, quint16 telnetPort) Q_DECL_NOEXCEPT_EXPR(false); void setupSSDPService() Q_DECL_NOEXCEPT_EXPR(false); |