summaryrefslogtreecommitdiffstats
path: root/src/qt-win32.patch
Commit message (Collapse)AuthorAgeFilesLines
* fixed odbc test on Mac and use "rm -f" instead of "rm"Mark Brand2010-04-111-5/+24
| | | | | Also improved compile test following sugestion from Qt developer Oswald Buddenhagen.
* bugfix: phonon backend does not depend on glib and gstreamer in package qtMark Brand2010-02-281-15/+40
| | | | | | | | | | The configure script assumes that gstreamer is the phonon backend but ds9 is used for mingw32. This patch fixes this in the configure script. We now invoke configure with -no-glib and -no-gstreamer. Also fixed case of GL include directory reference. Some syntactic improvements suggested upstream.
* do not introduce QtCore4 in ssl.priMark Brand2010-02-211-9/+6
| | | | | | | | | | | It is not correct to add QtCore4 in ssl.pri when -lz is removed for qt-zlib. In mingw-cross-env we add QtCore4 to OPENSSL_LIBS so the zlib dependency of openssl is satisfied in case of qt-zlib. This is necessary for the time being because the QtCore4 in the link command that qmake generates appears before the contents of OPENSSL_LIBS.
* fixed compile tests in ./configure of package qtMark Brand2010-02-191-274/+250
| | | | | | | | | | | | | | | | | | | | | | | | -fixed compile test for win32-g++ -removed compile test hacks since compile test works now -fixed odbc test for mingw32 -fixed iconv compile test for win32-g++ -fix ipv6 detection on win32-g++ -fix largefile detection on win32-g++ -fix getaddrinfo detection on win32-g++. Result is still negative, apparently correctly. -fix opengl detection on win32-g++ -removed obsolee opengl error hack -improved exempting win32-g++ from XLib test -improved zlib treatment when compiling on MAC for win32-g++ -finished rtti support -restored replacement of -lz with -lQtCore4 on ssl.pri -specifed "-no-fontcnfig" because this gets enabled now by default thanks to working freetype detection. -restored -openssl-linked, setting OPENSSL_LIBS and zlib fix in ssl.pri. Previous conclusion that these were unnecessary was apparently an experimental error. glib is now detected which I hope is a good thing.
* fixed dependencies for the shared psql plugin in package qtMark Brand2010-02-181-17/+18
| | | | | | | | | | | The postgresql library -lpq depends on -lsecure32, -lssl, and so on. These are static libraries. When we build the psql plugin as a shared library, linking fails unless we provide the list of required libraries. Previously, this was taken care of with a hack in the configure script. Since that hack is not suitable for an upstream merge request, I have moved it here.
* revert openssl hacks in configure and use pg_config in package qtMark Brand2010-02-171-38/+30
|
* simplified linking to openssl in package qtMark Brand2010-02-171-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have been building Qt with "-openssl-linked". A patch was needed to adjust OPENSSL_LIBS to keep a shared Qt build from failing at the point where QtNetwork4.dll is linked. The patch is not needed if we use "-openssl" instead. Because libssl and its dependencies are static libraries in mingw-cross-env, a simple "-openssl" also causes libssl and dependencies to be embedded (imported) into QNetwork4.dll, but it does so without requiring the patch. Details: The patch solved a problem that is a feature of a specific recipe of Qt build ingredients: (1) -shared (2) -openssl-linked (3) -qt-zlib in an environment were: (4) openssl is static (5) “system” zlib is static At least 1-3 are needed to see the problem. I suspect that 4 and 5 are needed as well. What I think I understand: “-shared” means that QtNetwork4.dll will be built, which is the locus of the problem. “-openssl-linked” means that libssl and its dependencies are to be embedded in QtNetwork4.dll. OPENSSL_LIBS supplies the list of dependencies. “-qt-zlib” means that QtCore4 contains a zlib implementation. Given this recipe for QtNetwork4.dll, the zlib implementation of “-lz” conflicts with the zlib implementation of “-lQtCore4”. The patch removed "-lz" from OPENSSL_LIBS and replaced it with "-lQtCore" in the same position. Adding "-lQtCore" in this way is not a robust solution. For example, it will break a debug build.
* restore all patch headersVolker Grabsch2010-02-161-1/+3
|
* update package qtMark Brand2010-02-151-8/+6
|
* point consequently to "doc/index.html" instead of "doc/index.html or doc/README"Volker Grabsch2010-02-071-1/+1
|
* update version of package qtMark Brand2010-01-211-49/+48
|
* simplified file markersVolker Grabsch2010-01-161-22/+2
|
* revised shared qsqlpsql plugin dependency handling for package qtMark Brand2009-12-131-127/+191
| | | | | | | | | | | | | Previously we added support for postgresql+openssl in shared Qt by explicitly linking to required libraries in psql.pro. However, we neglected to handle the case of shared build of Qt with system-zlib, which requires -lz. This patch takes care of -lz but also handles the situation more elegantly. Now we use QT_LFLAGS_PSQL as intended. We set it in the configure script with help from pkg-config for openssl dependencies. win32-g++ is now handled the unix way in psql.pro. This is consistent with other zlib-related work. For non system-zlib we remove the -lz. Also, as of now qt-win32.patch is generated by git diff.
* bugfix for package qt to work with the openssl-supported postgresqlMark Brand2009-12-121-1/+1
| | | | | | When building shared Qt plugin qsqlpsql, we have explicitly link to libraries on which -lpq depends. Recently added OpenSSL support to PostgreSQL adds a few more libraries.
* add missing "-lsecur32" to the PostgreSQL support of package qt (by Mark Brand)Volker Grabsch2009-12-071-0/+12
|
* improvements for package qt (by Mark Brand)Volker Grabsch2009-12-061-1015/+96
|
* some more improvements for package qt (by Mark Brand)Volker Grabsch2009-12-041-70/+403
|
* various improvements for package qt (by Mark Brand)Volker Grabsch2009-12-041-55/+631
|
* use more external libraries in package qt (by Mark Brand)Volker Grabsch2009-12-031-78/+287
|
* update version of package qt (by Mark Brand)Volker Grabsch2009-12-021-150/+90
|
* several improvements to package qt (by Mark Brand)Volker Grabsch2009-11-121-31/+338
| | | | | | | | * support for postgresql, tds and openssl * fixed detection for float, zlib, libjpeg, libtiff, libmng, libpng, postgresql, tds, sqlite, iconv, STL, IPv6 and openssl * added "-pipe" to CFLAGS to speed up build
* improvements for package qt (by Mark Brand)Volker Grabsch2009-11-081-7/+105
| | | | | | | | | | | | | Added support for compiler flag rtti to configure script. This was already supported by the configure binary for Windows. Fixed "detection" of mmx, 3dnow, sse, sse2, and rtti in configure script for win32-g++ target. Fixed failure to add a whole bunch of CONFIG options to qconfig.pri, including but not limited to mmx, 3dnow, sse, sse2. I wonder if this was a bug in the configure script. Now the CONFIG line looks more like the one produced by the configure binary.
* add ODBC support to package qt (by Mark Brand)Volker Grabsch2009-10-281-6/+18
|
* update version of package qt (by Mark Brand)Volker Grabsch2009-10-271-6/+44
|
* disable a disturbing build mechanism which is unnecessary when cross ↵Volker Grabsch2009-10-101-2/+20
| | | | compiling in package qt
* cleanup in the win32 patch of package qtVolker Grabsch2009-10-101-2/+6
|
* bugfix in the win32 patch of package qtVolker Grabsch2009-10-091-5/+2
|
* more bugfixes for package qtVolker Grabsch2009-10-061-4/+2
|
* add OpenGL support to package qt (by Martin Lambers)Volker Grabsch2009-10-061-1/+13
|
* simplified qt-win32 patch (by Mark Brand)Volker Grabsch2009-10-051-21/+0
|
* in the qt-win32 patch, don't override the effect of a potential configure ↵Volker Grabsch2009-10-041-1/+1
| | | | | | option "-no-exception" This makes it easier to switch between "-exception" and "-no-exception" in "src/qt.mk".
* several bugfixes for package qt to ensure that "i686-pc-mingw32-qmake ; ↵Volker Grabsch2009-10-041-4/+5
| | | | make" will work
* new package: qt (by Mark Brand)Volker Grabsch2009-10-031-0/+186
generated by cgit v0.12 at 2024-09-05 05:19:20 (GMT)