diff --git a/Makefile.in b/Makefile.in
index 78cb8cb0bc..ff449577da 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2254,7 +2254,7 @@ COND_TOOLKIT_MSW_WEBVIEW_HDR_PLATFORM =  \
 @COND_TOOLKIT_MOTIF@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h
 @COND_TOOLKIT_MSW@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h
 @COND_TOOLKIT_OSX_COCOA@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h
-@COND_TOOLKIT_Qt@OPENGL_HDR_PLATFORM = wx/qt/glcanvas.h
+@COND_TOOLKIT_QT@OPENGL_HDR_PLATFORM = wx/qt/glcanvas.h
 @COND_TOOLKIT_X11@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@AUI_GTK_HDR = wx/aui/tabartgtk.h
 @COND_TOOLKIT_MSW@AUI_PLATFORM_HDR = wx/aui/tabartmsw.h wx/aui/barartmsw.h
diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 98d7d98136..f3914c2f1a 100644
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -902,12 +902,6 @@ dnl ### begin block 20_COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0[wx.bkl] ###
         COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0)
-dnl ### begin block 20_COND_TOOLKIT_Qt[wx.bkl] ###
-    COND_TOOLKIT_Qt="#"
-    if test "x$TOOLKIT" = "xQt" ; then
-        COND_TOOLKIT_Qt=""
-    fi
-    AC_SUBST(COND_TOOLKIT_Qt)
 dnl ### begin block 20_COND_TOOLKIT_X11[wx.bkl] ###
     COND_TOOLKIT_X11="#"
     if test "x$TOOLKIT" = "xX11" ; then
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 618b65a5d2..80bda4474a 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3359,7 +3359,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         wx/gtk1/glcanvas.h
         wx/unix/glx11.h
     </if>
-    <if cond="TOOLKIT=='Qt'">wx/qt/glcanvas.h</if>
+    <if cond="TOOLKIT=='QT'">wx/qt/glcanvas.h</if>
     <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
     <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h wx/unix/glx11.h</if>
     <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h wx/unix/glx11.h</if>
diff --git a/configure b/configure
index 283e60c3a5..41198b8a52 100755
--- a/configure
+++ b/configure
@@ -700,7 +700,6 @@ COND_TOOLKIT_X11_WXUNIV_1
 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1
 COND_TOOLKIT_X11_USE_GUI_1
 COND_TOOLKIT_X11
-COND_TOOLKIT_Qt
 COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_QT_USE_GUI_1
 COND_TOOLKIT_QT
@@ -41457,11 +41456,6 @@ EOF
         COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0=""
     fi
 
-    COND_TOOLKIT_Qt="#"
-    if test "x$TOOLKIT" = "xQt" ; then
-        COND_TOOLKIT_Qt=""
-    fi
-
     COND_TOOLKIT_X11="#"
     if test "x$TOOLKIT" = "xX11" ; then
         COND_TOOLKIT_X11=""