diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-01 12:57:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-01 12:57:51 +0200 |
| commit | 3b1a966cc8ec6899097035386d37a2f9b6107e58 (patch) | |
| tree | 6b89da17f7b646c3f00ebb711edf8891962e60eb /src/app | |
| parent | fb73a87033c35c6a8199a2136381814e5a2e2e87 (diff) | |
| parent | a80f4d179b5ef0dd8a149c96c08d56004f916a70 (diff) | |
| download | qt-creator-3b1a966cc8ec6899097035386d37a2f9b6107e58.tar.gz | |
Merge remote-tracking branch 'origin/3.5'
Change-Id: Iebaabfc2f724cd493b7cab025406531cea5cd2dc
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/main.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index 3e9a523823..f8ce9a87f4 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -218,8 +218,10 @@ static inline QStringList getPluginPaths() // "%LOCALAPPDATA%\QtProject\qtcreator" on Windows Vista and later // "$XDG_DATA_HOME/data/QtProject/qtcreator" or "~/.local/share/data/QtProject/qtcreator" on Linux // "~/Library/Application Support/QtProject/Qt Creator" on Mac - pluginPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) - + QLatin1String("/data"); + pluginPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); +#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) + pluginPath += QLatin1String("/data"); +#endif pluginPath += QLatin1Char('/') + QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR) + QLatin1Char('/'); @@ -297,6 +299,8 @@ int main(int argc, char **argv) && !qEnvironmentVariableIsSet("QT_DEVICE_PIXEL_RATIO")) { qputenv("QT_DEVICE_PIXEL_RATIO", "auto"); } +#else + qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1"); #endif // < Qt 5.6 QLoggingCategory::setFilterRules(QLatin1String("qtc.*.debug=false")); |