ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/pyqt-relocatable-build.patch
(Generate patch)

Comparing COMP/CMSDIST/pyqt-relocatable-build.patch (file contents):
Revision 1.1 by eulisse, Tue Jan 5 10:02:28 2010 UTC vs.
Revision 1.2 by eulisse, Tue Jan 5 10:40:53 2010 UTC

# Line 1 | Line 1
1 < diff --git a/qtdirs.cpp b/qtdirs.cpp
2 < index 62e4de2..88cd68b 100644
3 < --- a/qtdirs.cpp
4 < +++ b/qtdirs.cpp
5 < @@ -1,9 +1,12 @@
6 < #include <QFile>
1 > diff --git a/configure.py b/configure.py
2 > index 8e77a38..cfc4c7c 100644
3 > --- a/configure.py
4 > +++ b/configure.py
5 > @@ -1658,9 +1658,13 @@ SOURCES = %s
6 > """#include <QFile>
7   #include <QLibraryInfo>
8   #include <QTextStream>
9   +#include <QCoreApplication>
# Line 11 | Line 11 | index 62e4de2..88cd68b 100644
11   -int main(int, char **)
12   +int main(int argc, char **argv)
13   {
14 + +    // A QCoreApplication is needed to make sure qt.conf is
15 + +    // read and handled correctly.
16   +    QCoreApplication *app = new QCoreApplication(argc, argv);
17 < +
16 <     QFile outf("qtdirs.out");
17 >     QFile outf("%s");
18  
19       if (!outf.open(QIODevice::WriteOnly|QIODevice::Truncate|QIODevice::Text))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines