From fbe69c1f461b93be2b4bc537fa938b8a26c2fc01 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Sun, 25 Jun 2017 17:47:38 +0200 Subject: [PATCH] migration from previous settings: CPP-8893 Configurable list of toolsets that include environment + CPP-10116 Allow selecting different toolsets/cmake/debugger for different projects/cmake configurations --- .../intellij/ide/customize/CustomizeIDEWizardDialog.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java index b9667411b53f..a901d42f4547 100644 --- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java +++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java @@ -24,7 +24,6 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.ui.JBCardLayout; import com.intellij.ui.components.JBLabel; -import com.intellij.util.PlatformUtils; import com.intellij.util.ui.JBUI; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; @@ -115,10 +114,8 @@ public class CustomizeIDEWizardDialog extends DialogWrapper implements ActionLis gbc.fill = GridBagConstraints.BOTH; gbc.gridx = 0; gbc.gridy = 0; - if (!PlatformUtils.isCLion()) { - buttonPanel.add(mySkipButton, gbc); - gbc.gridx++; - } + buttonPanel.add(mySkipButton, gbc); + gbc.gridx++; buttonPanel.add(myBackButton, gbc); gbc.gridx++; gbc.weightx = 1;