diff options
| author | Timothy Pearson <[email protected]> | 2013-05-01 15:09:36 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-05-01 15:09:36 -0500 |
| commit | 5faba37f113b6a4d75d7526cbbc1f363a465c39f (patch) | |
| tree | 6ac6c5d5b405e8ead8e42e5f1e50b1735cedb070 /configure | |
| parent | 33e2cf2d1ceff1515b2d7d2a2c29a48de63181b3 (diff) | |
| download | tqt3-5faba37f113b6a4d75d7526cbbc1f363a465c39f.tar.gz tqt3-5faba37f113b6a4d75d7526cbbc1f363a465c39f.zip | |
Automated update from Qt3
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -734,9 +734,6 @@ while [ "$#" -gt 0 ]; do glibmainloop) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_GLIBMAINLOOP="$VAL" - if [ "$VAL" = "yes" ]; then - echo "WARNING: glib main loop support is ***incomplete*** and will cause problems with threaded applications and/or those using non-standard event loops!" - fi else UNKNOWN_OPT=yes fi @@ -2644,13 +2641,11 @@ if [ "$CFG_GLIBMAINLOOP" = "no" ]; then elif [ "$CFG_GLIBMAINLOOP" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG glibmainloop" - GLIB_CFLAGS="`pkg-config --cflags glib-2.0`" + GLIB_CFLAGS="`pkg-config --cflags glib-2.0` `pkg-config --cflags gthread-2.0`" QMAKE_VARS="$QMAKE_VARS \"QMAKE_CFLAGS_GLIB=$GLIB_CFLAGS\"" - GLIB_LINKFLAG="`pkg-config --libs glib-2.0`" + GLIB_LINKFLAG="`pkg-config --libs glib-2.0` `pkg-config --libs gthread-2.0`" QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_GLIB=$GLIB_LINKFLAG\"" - - fi if [ "$CFG_GIF" = "no" ]; then QMAKE_CONFIG="$QMAKE_CONFIG no-gif" |