summaryrefslogtreecommitdiffstats
path: root/src/qt.mk
Commit message (Collapse)AuthorAgeFilesLines
* corrected version recognition regexes of many packagesVolker Grabsch2010-04-101-1/+1
|
* bugfix: phonon backend does not depend on glib and gstreamer in package qtMark Brand2010-02-281-1/+3
| | | | | | | | | | 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 add QtCore4 to OPENSSL_LIBS for static builds of package qtMark Brand2010-02-261-4/+4
| | | | | | | | | | | | | | | I assumed that having -lQtCore4 in OPENSSL_LIBS was harmless for static Qt. That is false. Although building Qt succeeds, this also causes an application's makefile generated by qmake to mention -lQtCore4. For static Qt, the actual library is called "libQtCore.a" (without the "4"), which caueses linking to fail. Therefore, I removed this library from OPENSSL_LIBS and included a reminder for people who want to build shared Qt with qt-zlib. Also, OPENSSL_LIBS and PSQL_LIBS are probably more than "harmless" for static Qt. They help qmake generate appropriate makefiles for applications.
* do not introduce QtCore4 in ssl.priMark Brand2010-02-211-2/+4
| | | | | | | | | | | 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.
* add missing dependencies for package qtMark Brand2010-02-191-1/+1
| | | | | Now the compile test works, qt detects and uses libiconv and glib. Added these to the dependency list for consistent builds.
* fixed compile tests in ./configure of package qtMark Brand2010-02-191-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | -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.
* use the correct pg_config tool in package qtVolker Grabsch2010-02-201-1/+1
|
* bugfix: use backquotes instead of $(shell ...) in the build rules of package qtMark Brand2010-02-181-1/+1
|
* fixed dependencies for the shared psql plugin in package qtMark Brand2010-02-181-1/+2
| | | | | | | | | | | 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-0/+3
|
* simplified linking to openssl in package qtMark Brand2010-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* changed coding style: make "-i" always the first argument of $(SED) (by ↵Volker Grabsch2010-02-161-9/+9
| | | | Mark Brand)
* update package qtMark Brand2010-02-151-2/+2
|
* point consequently to "doc/index.html" instead of "doc/index.html or doc/README"Volker Grabsch2010-02-071-1/+1
|
* test program for package qtVolker Grabsch2010-01-221-0/+6
|
* improved escaping in the build rules of package qtVolker Grabsch2010-01-221-7/+7
|
* update version of package qtMark Brand2010-01-211-2/+2
|
* simplified file markersVolker Grabsch2010-01-161-22/+2
|
* improvements for package qt (by Mark Brand)Volker Grabsch2009-12-061-11/+20
|
* some more improvements for package qt (by Mark Brand)Volker Grabsch2009-12-041-2/+2
|
* various improvements for package qt (by Mark Brand)Volker Grabsch2009-12-041-15/+1
|
* use more external libraries in package qt (by Mark Brand)Volker Grabsch2009-12-031-11/+19
|
* avoid tp/beta/rc/... versions of package qtVolker Grabsch2009-12-021-2/+1
|
* update version of package qt (by Mark Brand)Volker Grabsch2009-12-021-2/+2
|
* several improvements to package qt (by Mark Brand)Volker Grabsch2009-11-121-3/+7
| | | | | | | | * 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
* add ODBC support to package qt (by Mark Brand)Volker Grabsch2009-10-281-3/+4
|
* ignore technology previews of package qtVolker Grabsch2009-10-271-0/+1
|
* enable sqlite support in package qtVolker Grabsch2009-10-271-0/+1
|
* update version of package qt (by Mark Brand)Volker Grabsch2009-10-271-20/+11
|
* disabled WebKit because of problems with FreeBSD in package qtVolker Grabsch2009-10-191-1/+0
|
* disable sql and sqlite support in package qtVolker Grabsch2009-10-161-6/+1
|
* avoid external libraries in package qt, because qt doesn't set their ↵Volker Grabsch2009-10-101-6/+7
| | | | "LIBS=..." flags properly
* re-enable an important workaround in package qtVolker Grabsch2009-10-101-0/+1
|
* disable debug information for package qtVolker Grabsch2009-10-101-1/+2
|
* removed a workaround which is no longer needed at that place in package qt ↵Volker Grabsch2009-10-101-1/+1
| | | | (by Tony Theodore)
* portability fix for MacOS X for package qtVolker Grabsch2009-10-101-0/+5
|
* refer to external helper libraries in package qtVolker Grabsch2009-10-091-1/+7
|
* workaround for a build problem on Solaris of package qtVolker Grabsch2009-10-081-0/+1
|
* more bugfixes for package qtVolker Grabsch2009-10-061-0/+3
|
* add OpenGL support to package qt (by Martin Lambers)Volker Grabsch2009-10-061-0/+1
|
* build the native Qt tools from unpatched sourcesVolker Grabsch2009-10-051-8/+3
|
* simplify the native build in package qtVolker Grabsch2009-10-041-0/+1
|
* several bugfixes for package qt to ensure that "i686-pc-mingw32-qmake ; ↵Volker Grabsch2009-10-041-10/+7
| | | | make" will work
* adjusted package qt to the current coding styleVolker Grabsch2009-10-031-5/+5
|
* new package: qt (by Mark Brand)Volker Grabsch2009-10-031-0/+152