Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed Qt value of TOOLKIT, kept only QT

Browse Source
This commit is contained in:
Cătălin Răceanu
2018-08-03 00:24:47 +03:00
parent 6b2222a520
commit 8fc8220b6a
4 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@@ -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_MOTIF@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h
@COND_TOOLKIT_MSW@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h @COND_TOOLKIT_MSW@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h
@COND_TOOLKIT_OSX_COCOA@OPENGL_HDR_PLATFORM = wx/osx/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_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_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 @COND_TOOLKIT_MSW@AUI_PLATFORM_HDR = wx/aui/tabartmsw.h wx/aui/barartmsw.h

6
autoconf_inc.m4
View File

@@ -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="" COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0=""
fi fi
AC_SUBST(COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0) 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] ### dnl ### begin block 20_COND_TOOLKIT_X11[wx.bkl] ###
COND_TOOLKIT_X11="#" COND_TOOLKIT_X11="#"
if test "x$TOOLKIT" = "xX11" ; then if test "x$TOOLKIT" = "xX11" ; then

2
build/bakefiles/files.bkl
View File

@@ -3359,7 +3359,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/gtk1/glcanvas.h wx/gtk1/glcanvas.h
wx/unix/glx11.h wx/unix/glx11.h
</if> </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=='MSW'">wx/msw/glcanvas.h</if>
<if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h wx/unix/glx11.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> <if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h wx/unix/glx11.h</if>

6
configure vendored
View File

@@ -700,7 +700,6 @@ COND_TOOLKIT_X11_WXUNIV_1
COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1
COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1
COND_TOOLKIT_X11 COND_TOOLKIT_X11
COND_TOOLKIT_Qt
COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_QT_USE_GUI_1 COND_TOOLKIT_QT_USE_GUI_1
COND_TOOLKIT_QT COND_TOOLKIT_QT
@@ -41457,11 +41456,6 @@ EOF
COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="" COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0=""
fi fi
COND_TOOLKIT_Qt="#"
if test "x$TOOLKIT" = "xQt" ; then
COND_TOOLKIT_Qt=""
fi
COND_TOOLKIT_X11="#" COND_TOOLKIT_X11="#"
if test "x$TOOLKIT" = "xX11" ; then if test "x$TOOLKIT" = "xX11" ; then
COND_TOOLKIT_X11="" COND_TOOLKIT_X11=""