Mercurial > mxe-octave

comparison src/qt-win32.patch @ 520:9294e8fad5e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add ODBC support to package qt (by Mark Brand)
author Volker Grabsch <vog@notjusthosting.com>
date Wed, 28 Oct 2009 13:37:52 +0100
parents e97947e7d45e
children 28e14850b092
comparison
equal deleted inserted replaced
519:99a330c048df 520:9294e8fad5e9
19 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 19 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 20 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 21 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 22 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23 23
24 --- qt-everywhere-opensource-src-4.6.0-beta1.native/configure 2009-10-13 17:34:09.000000000 +0200 24 --- qt-everywhere-opensource-src-4.6.0-beta1.native/configure 2009-10-28 00:04:38.000000000 +0100
25 +++ qt-everywhere-opensource-src-4.6.0-beta1/configure 2009-10-25 13:14:22.000000000 +0100 25 +++ qt-everywhere-opensource-src-4.6.0-beta1/configure 2009-10-28 00:13:15.000000000 +0100
26 @@ -600,7 +600,7 @@ 26 @@ -600,7 +600,7 @@
27 rm -f "$outpath/config.tests/.qmake.cache" 27 rm -f "$outpath/config.tests/.qmake.cache"
28 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" 28 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
29 29
30 -QMakeVar add styles "cde mac motif plastique cleanlooks windows" 30 -QMakeVar add styles "cde mac motif plastique cleanlooks windows"
31 +QMakeVar add styles "cde mac motif plastique cleanlooks windows windowsxp windowsvista" 31 +QMakeVar add styles "cde mac motif plastique cleanlooks windows windowsxp windowsvista"
32 QMakeVar add decorations "default windows styled" 32 QMakeVar add decorations "default windows styled"
33 QMakeVar add mouse-drivers "pc" 33 QMakeVar add mouse-drivers "pc"
34 if [ "$UNAME_SYSTEM" = "Linux" ] ; then 34 if [ "$UNAME_SYSTEM" = "Linux" ] ; then
35 @@ -4956,7 +4956,9 @@ 35 @@ -4598,7 +4598,10 @@
36 ;;
37 odbc)
38 if [ "$CFG_SQL_odbc" != "no" ]; then
39 - if [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
40 + if [ "$XPLATFORM" = "win32-g++" ]; then
41 + echo "We cannot test for ODBC support since we are cross building for win32-g++, so we assume it is there."
42 + CFG_SQL_odbc=plugin
43 + elif [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
44 if [ "$CFG_SQL_odbc" = "auto" ]; then
45 CFG_SQL_odbc=plugin
46 fi
47 @@ -4956,7 +4959,9 @@
36 echo "Basic XLib functionality test failed!" 48 echo "Basic XLib functionality test failed!"
37 echo " You might need to modify the include and library search paths by editing" 49 echo " You might need to modify the include and library search paths by editing"
38 echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}." 50 echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
39 - exit 1 51 - exit 1
40 +echo NOTICE: This is a specially modifed configure script! 52 +echo NOTICE: This is a specially modifed configure script!
41 +echo For our purposes we do not want X11. 53 +echo For our purposes we do not want X11.
42 +# exit 1 54 +# exit 1
43 fi 55 fi
44 56
45 # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x) 57 # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
46 @@ -5030,7 +5032,9 @@ 58 @@ -5030,7 +5035,9 @@
47 echo " You might need to modify the include and library search paths by editing" 59 echo " You might need to modify the include and library search paths by editing"
48 echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" 60 echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
49 echo " ${XQMAKESPEC}." 61 echo " ${XQMAKESPEC}."
50 - exit 1 62 - exit 1
51 +echo NOTICE: This is a specially modifed configure script! 63 +echo NOTICE: This is a specially modifed configure script!
52 +echo For our purposes we do not want the OpenGL functionality test. 64 +echo For our purposes we do not want the OpenGL functionality test.
53 +# exit 1 65 +# exit 1
54 fi 66 fi
55 case "$PLATFORM" in 67 case "$PLATFORM" in
56 hpux*) 68 hpux*)
57 @@ -6096,11 +6100,12 @@ 69 @@ -6096,11 +6103,12 @@
58 QT_CONFIG="$QT_CONFIG freetype" 70 QT_CONFIG="$QT_CONFIG freetype"
59 fi 71 fi
60 72
61 -if [ "x$PLATFORM_MAC" = "xyes" ]; then 73 -if [ "x$PLATFORM_MAC" = "xyes" ]; then
62 - #On Mac we implicitly link against libz, so we 74 - #On Mac we implicitly link against libz, so we
70 +# [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system" 82 +# [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
71 +#fi 83 +#fi
72 if [ "$CFG_ZLIB" = "yes" ]; then 84 if [ "$CFG_ZLIB" = "yes" ]; then
73 QT_CONFIG="$QT_CONFIG zlib" 85 QT_CONFIG="$QT_CONFIG zlib"
74 elif [ "$CFG_ZLIB" = "system" ]; then 86 elif [ "$CFG_ZLIB" = "system" ]; then
75 @@ -7610,7 +7615,11 @@ 87 @@ -7610,7 +7618,11 @@
76 [ "$IN_ROOT" = "no" ] && continue 88 [ "$IN_ROOT" = "no" ] && continue
77 89
78 case $a in 90 case $a in
79 - *winmain/winmain.pro) continue ;; 91 - *winmain/winmain.pro) continue ;;
80 + *winmain/winmain.pro) 92 + *winmain/winmain.pro)