Mercurial > mxe-octave

changeset 1909:bd0e473505e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset 6aba5d36fb84 should have used newer version of patch
author Mark Brand <mabrand@mabrand.nl>
date Tue, 28 Jun 2011 21:12:44 +0200
parents f3568fc1a161
children ce3b84b9514f
files src/qt-test.cpp src/qt-test.pro src/qt.mk
diffstat 3 files changed, 1 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt-test.cpp	Tue Jun 28 20:59:03 2011 +0200
+++ b/src/qt-test.cpp	Tue Jun 28 21:12:44 2011 +0200
@@ -2,7 +2,6 @@
 /* See doc/index.html for further information. */
 
 #include <QApplication>
-#include <QtPlugin>
 #include "ui_qt-test.h"
 
 #ifdef  Q_OS_AIX
@@ -145,11 +144,6 @@
 #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 20:59:03 2011 +0200
+++ b/src/qt-test.pro	Tue Jun 28 21:12:44 2011 +0200
@@ -4,4 +4,3 @@
 TARGET   = test-qt
 SOURCES += qt-test.cpp
 FORMS   += qt-test.ui
-QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs
--- a/src/qt.mk	Tue Jun 28 20:59:03 2011 +0200
+++ b/src/qt.mk	Tue Jun 28 21:12:44 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 dbus
+$(PKG)_DEPS     := gcc libodbc++ postgresql freetds openssl zlib libpng jpeg libmng tiff sqlite libiconv dbus
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://qt.gitorious.org/qt/qt/commits' | \
@@ -41,7 +41,6 @@
         -prefix '$(PREFIX)/$(TARGET)' \
         -prefix-install \
         -script \
-        -no-iconv \
         -opengl desktop \
         -webkit \
         -no-glib \