From 40532781195d1aea64874d2a1c44219f4bdc0b02 Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Mon, 28 May 2018 17:20:49 +0300
Subject: [PATCH] Misc: Do not set icon via GUI Designer

Since Designer references icon by filename it fails
due to recent update in IDEA icon files

 #KT-24580 Fixed
---
 .../compiler/configuration/KotlinCompilerConfigurableTab.form  | 1 -
 .../compiler/configuration/KotlinCompilerConfigurableTab.java  | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
index 054d47b6c4f..ae3599781a4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
@@ -214,7 +214,6 @@
             </constraints>
             <properties>
               <focusable value="false"/>
-              <icon value="general/warningDialog.png"/>
               <inheritsPopupMenu value="false"/>
               <text value=""/>
               <visible value="false"/>
diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
index be76913f856..720d5f64857 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.idea.compiler.configuration;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
@@ -126,6 +127,8 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
         this.k2jvmCompilerArguments = k2jvmCompilerArguments;
         this.isProjectSettings = isProjectSettings;
 
+        warningLabel.setIcon(AllIcons.General.WarningDialog);
+
         if (isProjectSettings) {
             languageVersionComboBox.addActionListener(
                     new ActionListener() {