Annotation of /trunk/virtualbox/patches/virtualbox-1.3.8-qt-fix-2.patch
Parent Directory | Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1361 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1361 byte(s)
-import
1 | niro | 153 | --- vbox-ose-1.3.8/configure 2007-03-13 18:22:49.000000000 +0100 |
2 | +++ vbox-ose-1.3.8-qt-fix/configure 2007-04-13 20:12:15.000000000 +0200 | ||
3 | @@ -882,8 +882,8 @@ | ||
4 | echo "compiling the following source file:" >> $LOG | ||
5 | cat .tmp_src.cc >> $LOG | ||
6 | echo "using the following command line:" >> $LOG | ||
7 | - echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/lib -lqt-mt" >> $LOG | ||
8 | - $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/lib -lqt-mt >> $LOG 2>&1 | ||
9 | + echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include/qt -L$q/lib -lqt-mt" >> $LOG | ||
10 | + $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include/qt -L$q/lib -lqt-mt >> $LOG 2>&1 | ||
11 | if (($?==0)); then | ||
12 | if test_execute; then | ||
13 | cnf_append "QTDIR" `cd $q ; pwd` | ||
14 | --- vbox-ose-1.3.8/src/VBox/Frontends/VirtualBox/Makefile 2007-03-13 18:22:59.000000000 +0100 | ||
15 | +++ vbox-ose-1.3.8-qt-fix/src/VBox/Frontends/VirtualBox/Makefile 2007-04-13 20:46:09.000000000 +0200 | ||
16 | @@ -125,7 +125,7 @@ | ||
17 | VirtualBox_CXXFLAGS.win = \ | ||
18 | -nologo -Zm200 -W3 -MD -EHsc -DUNICODE -DQT_DLL -DQT_THREAD_SUPPORT -DQT_NO_DEBUG | ||
19 | VirtualBox_CXXFLAGS.linux = \ | ||
20 | - -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -D_REENTRANT | ||
21 | + -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -D_REENTRANT -I/usr/include/qt | ||
22 | |||
23 | VirtualBox_DEFS.debug = VBOX_GUI_DEBUG VBOX_CHECK_STATE # QT_FATAL_ASSERT | ||
24 | VirtualBox_DEFS += VBOX_GUI_SEPARATE_VM_PROCESS |