diff --git a/test/customdrawn/cd_test_all.lpi b/test/customdrawn/cd_test_all.lpi
index da207de2e9..0c48cbdef4 100644
--- a/test/customdrawn/cd_test_all.lpi
+++ b/test/customdrawn/cd_test_all.lpi
@@ -14,7 +14,7 @@
     <VersionInfo>
       <StringTable ProductVersion=""/>
     </VersionInfo>
-    <BuildModes Count="2">
+    <BuildModes Count="3">
       <Item1 Name="Default" Default="True"/>
       <Item2 Name="WinCE">
         <MacroValues Count="1">
@@ -48,6 +48,34 @@
           </Other>
         </CompilerOptions>
       </Item2>
+      <Item3 Name="qt">
+        <MacroValues Count="1">
+          <Macro1 Name="LCLWidgetType" Value="qt"/>
+        </MacroValues>
+        <CompilerOptions>
+          <Version Value="11"/>
+          <Target>
+            <Filename Value="cd_test_all"/>
+          </Target>
+          <SearchPaths>
+            <IncludeFiles Value="$(ProjOutDir)"/>
+            <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
+          </SearchPaths>
+          <Linking>
+            <Options>
+              <Win32>
+                <GraphicApplication Value="True"/>
+              </Win32>
+            </Options>
+          </Linking>
+          <Other>
+            <CompilerMessages>
+              <UseMsgFile Value="True"/>
+            </CompilerMessages>
+            <CompilerPath Value="$(CompPath)"/>
+          </Other>
+        </CompilerOptions>
+      </Item3>
     </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
diff --git a/test/customdrawn/mainform.lfm b/test/customdrawn/mainform.lfm
index a5ecbd4fe6..fdf336a539 100644
--- a/test/customdrawn/mainform.lfm
+++ b/test/customdrawn/mainform.lfm
@@ -60,7 +60,7 @@ object Form1: TForm1
     Height = 240
     Top = 40
     Width = 463
-    PageIndex = 22
+    PageIndex = 6
     Anchors = [akTop, akLeft, akRight]
     TabOrder = 2
     TabStop = True
@@ -186,8 +186,8 @@ object Form1: TForm1
         Left = 20
         Height = 18
         Top = 29
-        Width = 91
-        Caption = 'CheckBox1'
+        Width = 60
+        Caption = 'Native'
         TabOrder = 0
       end
       object CDCheckBox1: TCDCheckBox
@@ -210,9 +210,9 @@ object Form1: TForm1
         Left = 20
         Height = 18
         Top = 55
-        Width = 91
+        Width = 99
         AllowGrayed = True
-        Caption = 'CheckBox2'
+        Caption = 'Native+Gray'
         Checked = True
         State = cbChecked
         TabOrder = 3
@@ -229,7 +229,7 @@ object Form1: TForm1
       object CDCheckBox4: TCDCheckBox
         Left = 119
         Height = 19
-        Top = 94
+        Top = 88
         Width = 114
         AllowGrayed = True
         DrawStyle = dsWinCE
@@ -239,19 +239,36 @@ object Form1: TForm1
         Left = 119
         Height = 19
         Top = 117
-        Width = 113
+        Width = 74
         DrawStyle = dsWinXP
-        Caption = 'dsWinXP+Gray'
+        Caption = 'dsWinXP'
       end
       object CDCheckBox6: TCDCheckBox
         Left = 119
         Height = 19
-        Top = 141
+        Top = 136
         Width = 113
         AllowGrayed = True
         DrawStyle = dsWinXP
         Caption = 'dsWinXP+Gray'
       end
+      object CDCheckBox7: TCDCheckBox
+        Left = 119
+        Height = 19
+        Top = 167
+        Width = 86
+        DrawStyle = dsAndroid
+        Caption = 'dsAndroid'
+      end
+      object CDCheckBox8: TCDCheckBox
+        Left = 119
+        Height = 19
+        Top = 184
+        Width = 125
+        AllowGrayed = True
+        DrawStyle = dsAndroid
+        Caption = 'dsAndroid+Gray'
+      end
     end
     object pageRadioButton: TPage
       object GroupBox2: TGroupBox
diff --git a/test/customdrawn/mainform.pas b/test/customdrawn/mainform.pas
index e468eaf715..cbdbc7add6 100644
--- a/test/customdrawn/mainform.pas
+++ b/test/customdrawn/mainform.pas
@@ -25,6 +25,8 @@ type
     CDCheckBox4: TCDCheckBox;
     CDCheckBox5: TCDCheckBox;
     CDCheckBox6: TCDCheckBox;
+    CDCheckBox7: TCDCheckBox;
+    CDCheckBox8: TCDCheckBox;
     CDEdit1: TCDEdit;
     CDEdit2: TCDEdit;
     CDTabControl1: TCDTabControl;