diff options
4 files changed, 8 insertions, 8 deletions
diff --git a/src/libs/installer/addqtcreatorarrayvalueoperation.cpp b/src/libs/installer/addqtcreatorarrayvalueoperation.cpp index ce1a95e69..2d4d15c5c 100644 --- a/src/libs/installer/addqtcreatorarrayvalueoperation.cpp +++ b/src/libs/installer/addqtcreatorarrayvalueoperation.cpp @@ -142,11 +142,11 @@ bool AddQtCreatorArrayValueOperation::undoOperation() // default value is the old value to keep the possibility that old saved operations can run undo #ifdef Q_OS_MAC QString qtCreatorInstallerSettingsFileName = core->value(scQtCreatorInstallerSettingsFile, - QString::fromLatin1("%1/Qt Creator.app/Contents/Resources/Nokia/QtCreator.ini").arg( + QString::fromLatin1("%1/Qt Creator.app/Contents/Resources/QtProject/QtCreator.ini").arg( core->value(QLatin1String("TargetDir")))); #else QString qtCreatorInstallerSettingsFileName = core->value(scQtCreatorInstallerSettingsFile, - QString::fromLatin1("%1/QtCreator/share/qtcreator/Nokia/QtCreator.ini").arg(core->value( + QString::fromLatin1("%1/QtCreator/share/qtcreator/QtProject/QtCreator.ini").arg(core->value( QLatin1String("TargetDir")))); #endif diff --git a/src/libs/installer/registerdefaultdebuggeroperation.cpp b/src/libs/installer/registerdefaultdebuggeroperation.cpp index 0458100ac..c3762b7c4 100644 --- a/src/libs/installer/registerdefaultdebuggeroperation.cpp +++ b/src/libs/installer/registerdefaultdebuggeroperation.cpp @@ -149,11 +149,11 @@ bool RegisterDefaultDebuggerOperation::undoOperation() // default value is the old value to keep the possibility that old saved operations can run undo #ifdef Q_OS_MAC QString toolChainsXmlFilePath = core->value(scQtCreatorInstallerToolchainsFile, - QString::fromLatin1("%1/Qt Creator.app/Contents/Resources/Nokia/toolChains.xml").arg( + QString::fromLatin1("%1/Qt Creator.app/Contents/Resources/QtProject/toolChains.xml").arg( core->value(QLatin1String("TargetDir")))); #else QString toolChainsXmlFilePath = core->value(scQtCreatorInstallerToolchainsFile, - QString::fromLatin1("%1/QtCreator/share/qtcreator/Nokia/toolChains.xml").arg(core->value( + QString::fromLatin1("%1/QtCreator/share/qtcreator/QtProject/toolChains.xml").arg(core->value( QLatin1String("TargetDir")))); #endif diff --git a/src/libs/installer/registerqtvqnxoperation.cpp b/src/libs/installer/registerqtvqnxoperation.cpp index 481654de5..313687b5b 100644 --- a/src/libs/installer/registerqtvqnxoperation.cpp +++ b/src/libs/installer/registerqtvqnxoperation.cpp @@ -197,11 +197,11 @@ bool RegisterQtInCreatorQNXOperation::undoOperation() // default value is the old value to keep the possibility that old saved operations can run undo #ifdef Q_OS_MAC QString qtVersionsFileName = core->value(scQtCreatorInstallerQtVersionFile, - QString::fromLatin1("%1/Qt Creator.app/Contents/Resources/Nokia/qtversion.xml").arg( + QString::fromLatin1("%1/Qt Creator.app/Contents/Resources/QtProject/qtversion.xml").arg( core->value(QLatin1String("TargetDir")))); #else QString qtVersionsFileName = core->value(scQtCreatorInstallerQtVersionFile, - QString::fromLatin1("%1/QtCreator/share/qtcreator/Nokia/qtversion.xml").arg(core->value( + QString::fromLatin1("%1/QtCreator/share/qtcreator/QtProject/qtversion.xml").arg(core->value( QLatin1String("TargetDir")))); #endif diff --git a/src/libs/installer/registertoolchainoperation.cpp b/src/libs/installer/registertoolchainoperation.cpp index 5810b17a0..e0fb5324e 100644 --- a/src/libs/installer/registertoolchainoperation.cpp +++ b/src/libs/installer/registertoolchainoperation.cpp @@ -146,11 +146,11 @@ bool RegisterToolChainOperation::undoOperation() // default value is the old value to keep the possibility that old saved operations can run undo #ifdef Q_OS_MAC QString toolChainsXmlFilePath = core->value(scQtCreatorInstallerToolchainsFile, - QString::fromLatin1("%1/Qt Creator.app/Contents/Resources/Nokia/toolChains.xml").arg( + QString::fromLatin1("%1/Qt Creator.app/Contents/Resources/QtProject/toolChains.xml").arg( core->value(QLatin1String("TargetDir")))); #else QString toolChainsXmlFilePath = core->value(scQtCreatorInstallerToolchainsFile, - QString::fromLatin1("%1/QtCreator/share/qtcreator/Nokia/toolChains.xml").arg(core->value( + QString::fromLatin1("%1/QtCreator/share/qtcreator/QtProject/toolChains.xml").arg(core->value( QLatin1String("TargetDir")))); #endif |