diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2018-06-07 17:01:44 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2018-06-07 17:01:44 +0200 |
| commit | d781159470a49ef2d34b0a0c854091f7cf44ebc0 (patch) | |
| tree | 9a86b5239a830a8da83c963abe75c343730aa65c /src/main-lib/main.h | |
| parent | ce279d72db51ac7327b3c934fa0d35e8e4a1d8ce (diff) | |
| parent | 7e050758810b64cd6f2c096ccd9f71de9ad4c9c1 (diff) | |
| download | qtapplicationmanager-d781159470a49ef2d34b0a0c854091f7cf44ebc0.tar.gz | |
Merge remote-tracking branch 'tqc/5.11' into dev
Change-Id: Ifea3d53d9dfcb56dd5f98eb5c8ae4c97348fbe61
Diffstat (limited to 'src/main-lib/main.h')
| -rw-r--r-- | src/main-lib/main.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main-lib/main.h b/src/main-lib/main.h index c97f75d5..d07aa695 100644 --- a/src/main-lib/main.h +++ b/src/main-lib/main.h @@ -111,7 +111,8 @@ protected: void setMainQmlFile(const QString &mainQml) Q_DECL_NOEXCEPT_EXPR(false); void setupSingleOrMultiProcess(bool forceSingleProcess, bool forceMultiProcess) Q_DECL_NOEXCEPT_EXPR(false); void setupRuntimesAndContainers(const QVariantMap &runtimeConfigurations, const QVariantMap &openGLConfiguration, - const QVariantMap &containerConfigurations, const QStringList &containerPluginPaths); + const QVariantMap &containerConfigurations, const QStringList &containerPluginPaths, + const QStringList &iconThemeSearchPaths, const QString &iconThemeName); void setupInstallationLocations(const QVariantList &installationLocations); void loadApplicationDatabase(const QString &databasePath, bool recreateDatabase, const QString &singleApp) Q_DECL_NOEXCEPT_EXPR(false); |