--- qt4-build.eclass?revision=1.83	2010-09-09 19:59:15.000000000 +0400
+++ qt4-build.eclass	2010-09-09 19:58:31.000000000 +0400
@@ -224,14 +224,19 @@
 	fi
 
 	# Bug 282984 && Bug 295530
-	sed -e "s:\(^SYSTEM_VARIABLES\):CC="$(tc-getCC)"\nCXX="$(tc-getCXX)"\nCFLAGS=\"${CFLAGS}\"\nCXXFLAGS=\"${CXXFLAGS}\"\nLDFLAGS=\"${LDFLAGS}\"\n\1:" \
+	sed -e "/^SYSTEM_VARIABLES/i CC=\"$(tc-getCC)\"\nCXX=\"$(tc-getCXX)\"\nexport CFLAGS=\"${CFLAGS}\"\nexport CXXFLAGS=\"${CXXFLAGS}\"\nexport LDFLAGS=\"${LDFLAGS}\"" \
 		-i configure || die "sed qmake compilers failed"
 	# bug 321335
 	if version_is_at_least 4.6; then
 		find ./config.tests/unix -name "*.test" -type f -exec grep -lZ \$MAKE '{}' \; | \
 			xargs -0 \
-			sed -e "s:\(\$MAKE\):\1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" LINK="$(tc-getCXX)":g" \
+			sed -e "s:\(\$MAKE\):\1 CC=\"$(tc-getCC)\" CXX=\"$(tc-getCXX)\" LD=\"$(tc-getCXX)\" LINK=\"$(tc-getCXX)\":g" \
 				-i || die "sed test compilers failed"
+		find ./config.tests -type f -name "*.test" -exec grep -lZ '^\(CXX\|L\)FLAGS' '{}' \; | \
+			xargs -0 \
+			sed -e '/^CXXFLAGS/ s/""/"$CXXFLAGS"/' \
+				-e '/^LFLAGS/ s/""/"$LFLAGS $LDFLAGS"/' \
+				-i || die "sed test flags failed"
 	fi
 
 	# Bug 172219