Mercurial > mxe-octave
changeset 1908:f3568fc1a161
package qt: build with -no-iconv
mingw-cross-env should build Qt with "-no-iconv". That way, the
programmer will get linker errors when trying to build his application.
That way, he will know that he *must* include the text codec plugins.
| author | Nikos Chantziaras <realnc@arcor.de> |
|---|---|
| date | Tue, 28 Jun 2011 20:59:03 +0200 |
| parents | 828edf7aee9e |
| children | bd0e473505e5 |
| files | src/qt-test.cpp src/qt-test.pro src/qt.mk |
| diffstat | 3 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/qt-test.cpp Tue Jun 28 13:42:56 2011 +0200 +++ b/src/qt-test.cpp Tue Jun 28 20:59:03 2011 +0200 @@ -2,6 +2,7 @@ /* See doc/index.html for further information. */ #include <QApplication> +#include <QtPlugin> #include "ui_qt-test.h" #ifdef Q_OS_AIX @@ -144,6 +145,11 @@ #error "Q_WS_WIN is not defined" #endif +Q_IMPORT_PLUGIN(qcncodecs) +Q_IMPORT_PLUGIN(qjpcodecs) +Q_IMPORT_PLUGIN(qtwcodecs) +Q_IMPORT_PLUGIN(qkrcodecs) + int main(int argc, char *argv[]) { QApplication a(argc, argv);
--- a/src/qt-test.pro Tue Jun 28 13:42:56 2011 +0200 +++ b/src/qt-test.pro Tue Jun 28 20:59:03 2011 +0200 @@ -4,3 +4,4 @@ TARGET = test-qt SOURCES += qt-test.cpp FORMS += qt-test.ui +QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs
--- a/src/qt.mk Tue Jun 28 13:42:56 2011 +0200 +++ b/src/qt.mk Tue Jun 28 20:59:03 2011 +0200 @@ -10,7 +10,7 @@ $(PKG)_FILE := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://qt.nokia.com/ $(PKG)_URL := http://get.qt.nokia.com/qt/source/$($(PKG)_FILE) -$(PKG)_DEPS := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite libiconv dbus +$(PKG)_DEPS := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite dbus define $(PKG)_UPDATE wget -q -O- 'http://qt.gitorious.org/qt/qt/commits' | \ @@ -41,6 +41,7 @@ -prefix '$(PREFIX)/$(TARGET)' \ -prefix-install \ -script \ + -no-iconv \ -opengl desktop \ -webkit \ -no-glib \