diff options
| author | Nikos Chantziaras <realnc@arcor.de> | 2011-06-28 19:16:19 (GMT) |
|---|---|---|
| committer | Nikos Chantziaras <realnc@arcor.de> | 2011-06-28 19:16:19 (GMT) |
| commit | 788de552d0b424024f0c4ba0b28ccf845428f799 (patch) | |
| tree | e07987cab2dc73f6ca5ca97ba02f96126c5d5300 | |
| parent | b78b6fa5308d889209d34ba30d071f0002c669b9 (diff) | |
| download | mxe-788de552d0b424024f0c4ba0b28ccf845428f799.zip mxe-788de552d0b424024f0c4ba0b28ccf845428f799.tar.gz mxe-788de552d0b424024f0c4ba0b28ccf845428f799.tar.bz2 | |
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.
| -rw-r--r-- | src/qt-test.cpp | 6 | ||||
| -rw-r--r-- | src/qt-test.pro | 1 | ||||
| -rw-r--r-- | src/qt.mk | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/qt-test.cpp b/src/qt-test.cpp index 6f3797a..b29c6e4 100644 --- a/src/qt-test.cpp +++ b/src/qt-test.cpp @@ -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); diff --git a/src/qt-test.pro b/src/qt-test.pro index 4da2835..9eb301c 100644 --- a/src/qt-test.pro +++ b/src/qt-test.pro @@ -4,3 +4,4 @@ TARGET = test-qt SOURCES += qt-test.cpp FORMS += qt-test.ui +QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs @@ -10,7 +10,7 @@ $(PKG)_SUBDIR := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION) $(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' | \ @@ -28,7 +28,7 @@ define $(PKG)_BUILD cd '$(1)' && \ OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl`" \ PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl` -lws2_32" \ - SYBASE_LIBS="-lsybdb -liconv -lws2_32" \ + SYBASE_LIBS="-lsybdb -lws2_32" \ ./configure \ -opensource \ -confirm-license \ @@ -41,6 +41,7 @@ define $(PKG)_BUILD -prefix '$(PREFIX)/$(TARGET)' \ -prefix-install \ -script \ + -no-iconv \ -opengl desktop \ -webkit \ -no-glib \ |