diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-05-01 15:08:14 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-05-01 15:08:14 -0500 |
commit | c69c3400cbccaa8273918a68a749ce98a2340290 (patch) | |
tree | 64be258391f3e12477dfc1c4f9ae3ff8196c47d8 /configure | |
parent | 83d39cad274f592a43a3262926d215493caea0bc (diff) | |
download | qt3-c69c3400cbccaa8273918a68a749ce98a2340290.tar.gz qt3-c69c3400cbccaa8273918a68a749ce98a2340290.zip |
Use glib thread initialization functions when glib main loop is in use
This resolves Bug 1484
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" |