Update Qt4 to version 4.7.4

Fixes #124.
This commit is contained in:
Christian Prochaska 2012-02-20 19:56:50 +01:00 committed by Norman Feske
parent bf7a5c2b69
commit 2bbf40d76a
38 changed files with 3158 additions and 3147 deletions

View File

@ -12,7 +12,7 @@ CONTRIB_DIR = contrib
PATCHES_DIR = ../../src/lib/qt4
QT4_URL = ftp://ftp.trolltech.com/qt/source
QT4 = qt-everywhere-opensource-src-4.7.1
QT4 = qt-everywhere-opensource-src-4.7.4
QT4_TGZ = $(QT4).tar.gz
QTSCRIPTCLASSIC_URL = http://get.qt.nokia.com/qt/solutions/lgpl
@ -23,7 +23,6 @@ PATCHES = qt4_genode.patch \
qt4_nonblocking_sockets.patch \
qt4_no_search_for_resolv_lib.patch \
qt4_lwip_connect_semantics_adaption.patch \
qt4_no_separate_host_lookup_threads.patch \
previewer_example.patch \
textedit_example.patch \
qt4_no_exit_on_window_close.patch \

View File

@ -4,7 +4,7 @@
ifeq ($(QT4_IMPORTED),)
QT4_IMPORTED = true
QT4 = qt-everywhere-opensource-src-4.7.1
QT4 = qt-everywhere-opensource-src-4.7.4
# identify the qt4 repository by searching for a file that is unique for qt4
QT4_REP_DIR := $(call select_from_repositories,lib/import/import-qt4.mk)

View File

@ -1,4 +1,4 @@
QT4 = qt-everywhere-opensource-src-4.7.1
include $(REP_DIR)/lib/import/import-qt4.mk
SRC_CC = main.cpp qgifhandler.cpp

View File

@ -1,4 +1,4 @@
QT4 = qt-everywhere-opensource-src-4.7.1
include $(REP_DIR)/lib/import/import-qt4.mk
SRC_CC = main.cpp qjpeghandler.cpp

14
qt4/lib/mk/qt.inc Normal file
View File

@ -0,0 +1,14 @@
QT_SOURCES_FILTER_OUT += $(COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT)
QT_SOURCES_FILTERED = $(filter-out $(QT_SOURCES_FILTER_OUT), $(QT_SOURCES))
SRC_CC += $(filter %.cpp, $(QT_SOURCES_FILTERED))
SRC_C += $(filter %.c, $(QT_SOURCES_FILTERED))
COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTERED = $(filter-out $(COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT), $(COMPILER_MOC_HEADER_MAKE_ALL_FILES))
$(SRC_CC:.cpp=.o): $(COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTERED)
COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTERED = $(filter-out $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT), $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES))
$(SRC_CC:.cpp=.o): $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTERED)
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
$(REP_DIR)/src/lib/qt4/src/corelib/global

View File

@ -1,5 +0,0 @@
SRC_CC += $(filter %.cpp, $(QT_SOURCES))
SRC_C += $(filter %.c, $(QT_SOURCES))
$(SRC_CC:.cpp=.o): $(COMPILER_MOC_HEADER_MAKE_ALL_FILES)
$(SRC_CC:.cpp=.o): $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES)

View File

@ -8,196 +8,7 @@ QT_DEFINES += -DQT_BUILD_CORE_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII
# use default warning level to avoid noise when compiling contrib code
CC_WARN = -Wno-unused-but-set-variable -Wno-deprecated-declarations
# extracted from src/corelib/Makefile
QT_SOURCES = \
qabstractanimation.cpp \
qvariantanimation.cpp \
qpropertyanimation.cpp \
qanimationgroup.cpp \
qsequentialanimationgroup.cpp \
qparallelanimationgroup.cpp \
qpauseanimation.cpp \
qfuture.cpp \
qfutureinterface.cpp \
qfuturesynchronizer.cpp \
qfuturewatcher.cpp \
qrunnable.cpp \
qtconcurrentfilter.cpp \
qtconcurrentmap.cpp \
qtconcurrentresultstore.cpp \
qtconcurrentthreadengine.cpp \
qtconcurrentiteratekernel.cpp \
qtconcurrentexception.cpp \
qthreadpool.cpp \
qglobal.cpp \
qlibraryinfo.cpp \
qmalloc.cpp \
qnumeric.cpp \
qatomic.cpp \
qmutex.cpp \
qreadwritelock.cpp \
qmutexpool.cpp \
qsemaphore.cpp \
qthread.cpp \
qthreadstorage.cpp \
qbitarray.cpp \
qbytearray.cpp \
qbytearraymatcher.cpp \
qcryptographichash.cpp \
qdatetime.cpp \
qeasingcurve.cpp \
qelapsedtimer.cpp \
qhash.cpp \
qline.cpp \
qlinkedlist.cpp \
qlist.cpp \
qlocale.cpp \
qpoint.cpp \
qmap.cpp \
qmargins.cpp \
qcontiguouscache.cpp \
qrect.cpp \
qregexp.cpp \
qshareddata.cpp \
qsharedpointer.cpp \
qsimd.cpp \
qsize.cpp \
qstring.cpp \
qstringbuilder.cpp \
qstringlist.cpp \
qtextboundaryfinder.cpp \
qtimeline.cpp \
qvector.cpp \
qvsnprintf.cpp \
qelapsedtimer_unix.cpp \
harfbuzz-buffer.c \
harfbuzz-gdef.c \
harfbuzz-gsub.c \
harfbuzz-gpos.c \
harfbuzz-impl.c \
harfbuzz-open.c \
harfbuzz-stream.c \
harfbuzz-shaper-all.cpp \
qharfbuzz.cpp \
qabstractfileengine.cpp \
qbuffer.cpp \
qdatastream.cpp \
qdataurl.cpp \
qdebug.cpp \
qdir.cpp \
qdiriterator.cpp \
qfile.cpp \
qfileinfo.cpp \
qiodevice.cpp \
qnoncontiguousbytedevice.cpp \
qprocess.cpp \
qtextstream.cpp \
qtemporaryfile.cpp \
qresource.cpp \
qresource_iterator.cpp \
qurl.cpp \
qsettings.cpp \
qfsfileengine.cpp \
qfsfileengine_iterator.cpp \
qfilesystemwatcher.cpp \
qfsfileengine_unix.cpp \
qfsfileengine_iterator_unix.cpp \
qpluginloader.cpp \
qfactoryloader.cpp \
quuid.cpp \
qlibrary.cpp \
qlibrary_unix.cpp \
qabstracteventdispatcher.cpp \
qabstractitemmodel.cpp \
qbasictimer.cpp \
qeventloop.cpp \
qcoreapplication.cpp \
qcoreevent.cpp \
qmetaobject.cpp \
qmetatype.cpp \
qmimedata.cpp \
qobject.cpp \
qobjectcleanuphandler.cpp \
qsignalmapper.cpp \
qsocketnotifier.cpp \
qtimer.cpp \
qtranslator.cpp \
qvariant.cpp \
qcoreglobaldata.cpp \
qsystemsemaphore.cpp \
qpointer.cpp \
qmath.cpp \
qcore_unix.cpp \
qisciicodec.cpp \
qlatincodec.cpp \
qsimplecodec.cpp \
qtextcodec.cpp \
qtsciicodec.cpp \
qutfcodec.cpp \
qtextcodecplugin.cpp \
qfontlaocodec.cpp \
qgb18030codec.cpp \
qjpunicode.cpp \
qeucjpcodec.cpp \
qjiscodec.cpp \
qsjiscodec.cpp \
qeuckrcodec.cpp \
qbig5codec.cpp \
qfontjpcodec.cpp \
qstatemachine.cpp \
qabstractstate.cpp \
qstate.cpp \
qfinalstate.cpp \
qhistorystate.cpp \
qabstracttransition.cpp \
qsignaltransition.cpp \
qeventtransition.cpp \
qxmlstream.cpp \
qxmlutils.cpp \
moc_qthreadpool.cpp \
moc_qnamespace.cpp \
moc_qthread.cpp \
moc_qeasingcurve.cpp \
moc_qlocale.cpp \
moc_qtimeline.cpp \
moc_qfile.cpp \
moc_qiodevice.cpp \
moc_qnoncontiguousbytedevice_p.cpp \
moc_qtemporaryfile.cpp \
moc_qsettings.cpp \
moc_qfilesystemwatcher_p.cpp \
moc_qpluginloader.cpp \
moc_qlibrary.cpp \
moc_qfactoryloader_p.cpp \
moc_qabstracteventdispatcher.cpp \
moc_qabstractitemmodel.cpp \
moc_qeventloop.cpp \
moc_qcoreapplication.cpp \
moc_qcoreevent.cpp \
moc_qmimedata.cpp \
moc_qsocketnotifier.cpp \
moc_qtimer.cpp \
moc_qtranslator.cpp \
moc_qobjectcleanuphandler.cpp \
moc_qtextcodecplugin.cpp \
moc_qabstractstate.cpp \
moc_qstate.cpp \
moc_qfinalstate.cpp \
moc_qhistorystate.cpp \
moc_qabstracttransition.cpp \
moc_qsignaltransition.cpp \
moc_qeventtransition.cpp
# UNIX-specific files removed
# qcrashhandler.cpp \
# qprocess_unix.cpp \
# qeventdispatcher_unix.cpp \
# qmutex_unix.cpp \
# qthread_unix.cpp \
# qwaitcondition_unix.cpp \
# qsharedmemory_unix.cpp \
# qsystemsemaphore_unix.cpp \
# moc_qeventdispatcher_unix_p.cpp \
include $(REP_DIR)/lib/mk/qt_core_generated.inc
# add Genode-specific sources
QT_SOURCES += qprocess_genode.cpp \
@ -207,65 +18,22 @@ QT_SOURCES += qprocess_genode.cpp \
qwaitcondition_genode.cpp \
moc_qeventdispatcher_genode_p.cpp
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
# remove unsupported UNIX-specific files
QT_SOURCES_FILTER_OUT = \
moc_qeventdispatcher_unix_p.cpp \
qeventdispatcher_unix.cpp \
qmutex_unix.cpp \
qprocess_unix.cpp \
qthread_unix.cpp \
qwaitcondition_unix.cpp
# source files generated from existing header files ("moc_%.cpp: %.h" rule in spec-qt4.mk)
# extracted from "compiler_moc_header_make_all" target
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qabstractanimation.cpp \
moc_qvariantanimation.cpp \
moc_qpropertyanimation.cpp \
moc_qanimationgroup.cpp \
moc_qsequentialanimationgroup.cpp \
moc_qparallelanimationgroup.cpp \
moc_qpauseanimation.cpp \
moc_qthreadpool.cpp \
moc_qnamespace.cpp \
moc_qthread.cpp \
moc_qeasingcurve.cpp \
moc_qlocale.cpp \
moc_qtimeline.cpp \
moc_qbuffer.cpp \
moc_qfile.cpp \
moc_qiodevice.cpp \
moc_qnoncontiguousbytedevice_p.cpp \
moc_qprocess.cpp \
moc_qtemporaryfile.cpp \
moc_qsettings.cpp \
moc_qfilesystemwatcher.cpp \
moc_qfilesystemwatcher_p.cpp \
moc_qpluginloader.cpp \
moc_qlibrary.cpp \
moc_qfactoryloader_p.cpp \
moc_qabstracteventdispatcher.cpp \
moc_qabstractitemmodel.cpp \
moc_qeventloop.cpp \
moc_qcoreapplication.cpp \
moc_qcoreevent.cpp \
moc_qmimedata.cpp \
moc_qobject.cpp \
moc_qsignalmapper.cpp \
moc_qsocketnotifier.cpp \
moc_qtimer.cpp \
moc_qtranslator.cpp \
moc_qobjectcleanuphandler.cpp \
moc_qeventdispatcher_unix_p.cpp \
moc_qtextcodecplugin.cpp \
moc_qstatemachine.cpp
# remove unneeded files to prevent moc warnings
COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \
moc_qfuturewatcher.cpp \
moc_qsharedmemory.cpp
# source files generated from existing source files ("%.moc: %.cpp" rule in spec-qt4.mk)
# extracted from "compiler_moc_source_make_all" rule
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
qtextstream.moc \
qfilesystemwatcher.moc \
qtimer.moc
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
$(REP_DIR)/include/qt4/QtCore/private \
INC_DIR += $(REP_DIR)/include/qt4/QtCore/private \
$(REP_DIR)/contrib/$(QT4)/include/QtCore/private \
$(REP_DIR)/src/lib/qt4/src/corelib/global \
$(REP_DIR)/contrib/$(QT4)/src/corelib/codecs \
$(REP_DIR)/contrib/$(QT4)/src/3rdparty/harfbuzz/src
LIBS += launchpad server cxx env thread zlib libc libm alarm libc_lock_pipe
@ -307,4 +75,4 @@ vpath % $(REP_DIR)/contrib/$(QT4)/src/plugins/codecs/jp
vpath % $(REP_DIR)/contrib/$(QT4)/src/plugins/codecs/kr
vpath % $(REP_DIR)/contrib/$(QT4)/src/plugins/codecs/tw
include $(REP_DIR)/lib/mk/qt.mk
include $(REP_DIR)/lib/mk/qt.inc

View File

@ -0,0 +1,257 @@
QT_SOURCES = \
qabstractanimation.cpp \
qvariantanimation.cpp \
qpropertyanimation.cpp \
qanimationgroup.cpp \
qsequentialanimationgroup.cpp \
qparallelanimationgroup.cpp \
qpauseanimation.cpp \
qfuture.cpp \
qfutureinterface.cpp \
qfuturesynchronizer.cpp \
qfuturewatcher.cpp \
qrunnable.cpp \
qtconcurrentfilter.cpp \
qtconcurrentmap.cpp \
qtconcurrentresultstore.cpp \
qtconcurrentthreadengine.cpp \
qtconcurrentiteratekernel.cpp \
qtconcurrentexception.cpp \
qthreadpool.cpp \
qglobal.cpp \
qlibraryinfo.cpp \
qmalloc.cpp \
qnumeric.cpp \
qatomic.cpp \
qmutex.cpp \
qreadwritelock.cpp \
qmutexpool.cpp \
qsemaphore.cpp \
qthread.cpp \
qthreadstorage.cpp \
qmutex_unix.cpp \
qthread_unix.cpp \
qwaitcondition_unix.cpp \
qbitarray.cpp \
qbytearray.cpp \
qbytearraymatcher.cpp \
qcryptographichash.cpp \
qdatetime.cpp \
qeasingcurve.cpp \
qelapsedtimer.cpp \
qhash.cpp \
qline.cpp \
qlinkedlist.cpp \
qlist.cpp \
qlocale.cpp \
qpoint.cpp \
qmap.cpp \
qmargins.cpp \
qcontiguouscache.cpp \
qrect.cpp \
qregexp.cpp \
qshareddata.cpp \
qsharedpointer.cpp \
qsimd.cpp \
qsize.cpp \
qstring.cpp \
qstringbuilder.cpp \
qstringlist.cpp \
qtextboundaryfinder.cpp \
qtimeline.cpp \
qvector.cpp \
qvsnprintf.cpp \
qelapsedtimer_unix.cpp \
harfbuzz-buffer.c \
harfbuzz-gdef.c \
harfbuzz-gsub.c \
harfbuzz-gpos.c \
harfbuzz-impl.c \
harfbuzz-open.c \
harfbuzz-stream.c \
harfbuzz-shaper-all.cpp \
qharfbuzz.cpp \
qabstractfileengine.cpp \
qbuffer.cpp \
qdatastream.cpp \
qdataurl.cpp \
qdebug.cpp \
qdir.cpp \
qdiriterator.cpp \
qfile.cpp \
qfileinfo.cpp \
qiodevice.cpp \
qnoncontiguousbytedevice.cpp \
qprocess.cpp \
qtextstream.cpp \
qtemporaryfile.cpp \
qresource.cpp \
qresource_iterator.cpp \
qurl.cpp \
qsettings.cpp \
qfsfileengine.cpp \
qfsfileengine_iterator.cpp \
qfilesystemwatcher.cpp \
qfsfileengine_unix.cpp \
qfsfileengine_iterator_unix.cpp \
qprocess_unix.cpp \
qpluginloader.cpp \
qfactoryloader.cpp \
quuid.cpp \
qlibrary.cpp \
qlibrary_unix.cpp \
qabstracteventdispatcher.cpp \
qabstractitemmodel.cpp \
qbasictimer.cpp \
qeventloop.cpp \
qcoreapplication.cpp \
qcoreevent.cpp \
qmetaobject.cpp \
qmetatype.cpp \
qmimedata.cpp \
qobject.cpp \
qobjectcleanuphandler.cpp \
qsignalmapper.cpp \
qsocketnotifier.cpp \
qtimer.cpp \
qtranslator.cpp \
qvariant.cpp \
qcoreglobaldata.cpp \
qsharedmemory.cpp \
qsystemsemaphore.cpp \
qpointer.cpp \
qmath.cpp \
qcore_unix.cpp \
qcrashhandler.cpp \
qsharedmemory_unix.cpp \
qsystemsemaphore_unix.cpp \
qeventdispatcher_unix.cpp \
qisciicodec.cpp \
qlatincodec.cpp \
qsimplecodec.cpp \
qtextcodec.cpp \
qtsciicodec.cpp \
qutfcodec.cpp \
qtextcodecplugin.cpp \
qfontlaocodec.cpp \
qgb18030codec.cpp \
qjpunicode.cpp \
qeucjpcodec.cpp \
qjiscodec.cpp \
qsjiscodec.cpp \
qeuckrcodec.cpp \
qbig5codec.cpp \
qfontjpcodec.cpp \
qstatemachine.cpp \
qabstractstate.cpp \
qstate.cpp \
qfinalstate.cpp \
qhistorystate.cpp \
qabstracttransition.cpp \
qsignaltransition.cpp \
qeventtransition.cpp \
qxmlstream.cpp \
qxmlutils.cpp \
moc_qfuturewatcher.cpp \
moc_qthreadpool.cpp \
moc_qnamespace.cpp \
moc_qthread.cpp \
moc_qeasingcurve.cpp \
moc_qlocale.cpp \
moc_qtimeline.cpp \
moc_qfile.cpp \
moc_qiodevice.cpp \
moc_qnoncontiguousbytedevice_p.cpp \
moc_qtemporaryfile.cpp \
moc_qsettings.cpp \
moc_qfilesystemwatcher_p.cpp \
moc_qpluginloader.cpp \
moc_qlibrary.cpp \
moc_qfactoryloader_p.cpp \
moc_qabstracteventdispatcher.cpp \
moc_qabstractitemmodel.cpp \
moc_qeventloop.cpp \
moc_qcoreapplication.cpp \
moc_qcoreevent.cpp \
moc_qmimedata.cpp \
moc_qsocketnotifier.cpp \
moc_qtimer.cpp \
moc_qtranslator.cpp \
moc_qobjectcleanuphandler.cpp \
moc_qsharedmemory.cpp \
moc_qeventdispatcher_unix_p.cpp \
moc_qtextcodecplugin.cpp \
moc_qabstractstate.cpp \
moc_qstate.cpp \
moc_qfinalstate.cpp \
moc_qhistorystate.cpp \
moc_qabstracttransition.cpp \
moc_qsignaltransition.cpp \
moc_qeventtransition.cpp
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
# source files generated from existing header files ('moc_%.cpp: %.h' rule in spec-qt4.mk)
# extracted from 'compiler_moc_header_make_all' target
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qabstractanimation.cpp \
moc_qvariantanimation.cpp \
moc_qpropertyanimation.cpp \
moc_qanimationgroup.cpp \
moc_qsequentialanimationgroup.cpp \
moc_qparallelanimationgroup.cpp \
moc_qpauseanimation.cpp \
moc_qfuturewatcher.cpp \
moc_qthreadpool.cpp \
moc_qnamespace.cpp \
moc_qthread.cpp \
moc_qeasingcurve.cpp \
moc_qlocale.cpp \
moc_qtimeline.cpp \
moc_qbuffer.cpp \
moc_qfile.cpp \
moc_qiodevice.cpp \
moc_qnoncontiguousbytedevice_p.cpp \
moc_qprocess.cpp \
moc_qtemporaryfile.cpp \
moc_qsettings.cpp \
moc_qfilesystemwatcher.cpp \
moc_qfilesystemwatcher_p.cpp \
moc_qpluginloader.cpp \
moc_qlibrary.cpp \
moc_qfactoryloader_p.cpp \
moc_qabstracteventdispatcher.cpp \
moc_qabstractitemmodel.cpp \
moc_qeventloop.cpp \
moc_qcoreapplication.cpp \
moc_qcoreevent.cpp \
moc_qmimedata.cpp \
moc_qobject.cpp \
moc_qsignalmapper.cpp \
moc_qsocketnotifier.cpp \
moc_qtimer.cpp \
moc_qtranslator.cpp \
moc_qobjectcleanuphandler.cpp \
moc_qsharedmemory.cpp \
moc_qeventdispatcher_unix_p.cpp \
moc_qtextcodecplugin.cpp \
moc_qstatemachine.cpp \
moc_qabstractstate.cpp \
moc_qstate.cpp \
moc_qfinalstate.cpp \
moc_qhistorystate.cpp \
moc_qabstracttransition.cpp \
moc_qsignaltransition.cpp \
moc_qeventtransition.cpp
# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk)
# extracted from 'compiler_moc_source_make_all' rule
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
qtextstream.moc \
qfilesystemwatcher.moc \
qprocess_unix.moc \
qtimer.moc

View File

@ -9,471 +9,7 @@ QT_DEFINES += -DQT_NO_QWS_SIGNALHANDLER
# use default warning level to avoid noise when compiling contrib code
CC_WARN = -Wno-unused-but-set-variable -Wno-deprecated-declarations
# extracted from src/gui/Makefile
QT_SOURCES = \
qsoundqss_qws.cpp \
qcopchannel_qws.cpp \
qdecoration_qws.cpp \
qdecorationfactory_qws.cpp \
qdecorationplugin_qws.cpp \
qdirectpainter_qws.cpp \
qlock.cpp \
qscreen_qws.cpp \
qscreenmulti_qws.cpp \
qscreenproxy_qws.cpp \
qwindowsystem_qws.cpp \
qwscommand_qws.cpp \
qwscursor_qws.cpp \
qwsevent_qws.cpp \
qwsmanager_qws.cpp \
qwsproperty_qws.cpp \
qtransportauth_qws.cpp \
qwslock.cpp \
qwssharedmemory.cpp \
qwssocket_qws.cpp \
qwssignalhandler.cpp \
qwsembedwidget.cpp \
qdecorationdefault_qws.cpp \
qdecorationstyled_qws.cpp \
qdecorationwindows_qws.cpp \
qscreendriverplugin_qws.cpp \
qscreendriverfactory_qws.cpp \
qkbd_qws.cpp \
qkbddriverplugin_qws.cpp \
qkbddriverfactory_qws.cpp \
qmouse_qws.cpp \
qmousedriverplugin_qws.cpp \
qmousedriverfactory_qws.cpp \
qguivariantanimation.cpp \
qaction.cpp \
qactiongroup.cpp \
qapplication.cpp \
qboxlayout.cpp \
qclipboard.cpp \
qcursor.cpp \
qdrag.cpp \
qdnd.cpp \
qevent.cpp \
qformlayout.cpp \
qgridlayout.cpp \
qkeysequence.cpp \
qlayout.cpp \
qlayoutengine.cpp \
qlayoutitem.cpp \
qmime.cpp \
qpalette.cpp \
qshortcut.cpp \
qshortcutmap.cpp \
qsound.cpp \
qstackedlayout.cpp \
qtooltip.cpp \
qguivariant.cpp \
qwhatsthis.cpp \
qwidget.cpp \
qwidgetaction.cpp \
qkeymapper.cpp \
qgesture.cpp \
qstandardgestures.cpp \
qgesturerecognizer.cpp \
qgesturemanager.cpp \
qsoftkeymanager.cpp \
qdesktopwidget.cpp \
qguiplatformplugin.cpp \
qapplication_qws.cpp \
qclipboard_qws.cpp \
qcursor_qws.cpp \
qdesktopwidget_qws.cpp \
qdnd_qws.cpp \
qeventdispatcher_qws.cpp \
qsound_qws.cpp \
qwidget_qws.cpp \
qkeymapper_qws.cpp \
qsessionmanager_qws.cpp \
qbitmap.cpp \
qicon.cpp \
qiconloader.cpp \
qimage.cpp \
qimageiohandler.cpp \
qimagereader.cpp \
qimagewriter.cpp \
qpaintengine_pic.cpp \
qpicture.cpp \
qpictureformatplugin.cpp \
qpixmap.cpp \
qpixmapcache.cpp \
qpixmapdata.cpp \
qpixmapdatafactory.cpp \
qpixmapfilter.cpp \
qiconengine.cpp \
qiconengineplugin.cpp \
qmovie.cpp \
qpixmap_raster.cpp \
qnativeimage.cpp \
qimagepixmapcleanuphooks.cpp \
qpixmap_qws.cpp \
qbmphandler.cpp \
qppmhandler.cpp \
qxbmhandler.cpp \
qxpmhandler.cpp \
qpnghandler.cpp \
qbezier.cpp \
qblendfunctions.cpp \
qbrush.cpp \
qcolor.cpp \
qcolor_p.cpp \
qcssutil.cpp \
qdrawutil.cpp \
qemulationpaintengine.cpp \
qgraphicssystem.cpp \
qmatrix.cpp \
qmemrotate.cpp \
qoutlinemapper.cpp \
qpaintdevice.cpp \
qpaintengine.cpp \
qpaintengine_alpha.cpp \
qpaintengine_preview.cpp \
qpaintengineex.cpp \
qpainter.cpp \
qpainterpath.cpp \
qpathclipper.cpp \
qpdf.cpp \
qpen.cpp \
qpolygon.cpp \
qprintengine_pdf.cpp \
qprintengine_ps.cpp \
qprinter.cpp \
qrasterizer.cpp \
qregion.cpp \
qstroker.cpp \
qstylepainter.cpp \
qtessellator.cpp \
qtextureglyphcache.cpp \
qtransform.cpp \
qwindowsurface.cpp \
qpaintbuffer.cpp \
qpaintengine_raster.cpp \
qdrawhelper.cpp \
qimagescale.cpp \
qgrayraster.c \
qgraphicssystem_qws.cpp \
qprinterinfo_unix.cpp \
qbackingstore.cpp \
qcolormap_qws.cpp \
qpaintdevice_qws.cpp \
qcups.cpp \
qwindowsurface_qws.cpp \
qfont.cpp \
qfontengine.cpp \
qfontsubset.cpp \
qfontmetrics.cpp \
qfontdatabase.cpp \
qtextcontrol.cpp \
qtextengine.cpp \
qtextlayout.cpp \
qtextformat.cpp \
qtextobject.cpp \
qtextoption.cpp \
qfragmentmap.cpp \
qtextdocument.cpp \
qtextdocument_p.cpp \
qtexthtmlparser.cpp \
qabstracttextdocumentlayout.cpp \
qtextdocumentlayout.cpp \
qtextcursor.cpp \
qtextdocumentfragment.cpp \
qtextimagehandler.cpp \
qtexttable.cpp \
qtextlist.cpp \
qtextdocumentwriter.cpp \
qsyntaxhighlighter.cpp \
qcssparser.cpp \
qzip.cpp \
qtextodfwriter.cpp \
qstatictext.cpp \
qfont_qws.cpp \
qfontengine_qws.cpp \
qfontengine_ft.cpp \
qfontengine_qpf.cpp \
qabstractfontengine_qws.cpp \
qstyle.cpp \
qstylefactory.cpp \
qstyleoption.cpp \
qstyleplugin.cpp \
qstylehelper.cpp \
qcommonstyle.cpp \
qproxystyle.cpp \
qstylesheetstyle.cpp \
qstylesheetstyle_default.cpp \
qcdestyle.cpp \
qplastiquestyle.cpp \
qcleanlooksstyle.cpp \
qwindowsstyle.cpp \
qmotifstyle.cpp \
qabstractbutton.cpp \
qabstractslider.cpp \
qabstractspinbox.cpp \
qcalendarwidget.cpp \
qcheckbox.cpp \
qcombobox.cpp \
qcommandlinkbutton.cpp \
qdatetimeedit.cpp \
qdial.cpp \
qdialogbuttonbox.cpp \
qdockwidget.cpp \
qdockarealayout.cpp \
qeffects.cpp \
qfontcombobox.cpp \
qframe.cpp \
qgroupbox.cpp \
qlabel.cpp \
qlcdnumber.cpp \
qlineedit_p.cpp \
qlineedit.cpp \
qlinecontrol.cpp \
qmainwindow.cpp \
qmainwindowlayout.cpp \
qmdiarea.cpp \
qmdisubwindow.cpp \
qmenu.cpp \
qmenubar.cpp \
qmenudata.cpp \
qprogressbar.cpp \
qpushbutton.cpp \
qradiobutton.cpp \
qrubberband.cpp \
qscrollbar.cpp \
qsizegrip.cpp \
qslider.cpp \
qspinbox.cpp \
qsplashscreen.cpp \
qsplitter.cpp \
qstackedwidget.cpp \
qstatusbar.cpp \
qtabbar.cpp \
qtabwidget.cpp \
qtextedit.cpp \
qtextbrowser.cpp \
qtoolbar.cpp \
qtoolbarlayout.cpp \
qtoolbarextension.cpp \
qtoolbarseparator.cpp \
qtoolbox.cpp \
qtoolbutton.cpp \
qvalidator.cpp \
qabstractscrollarea.cpp \
qwidgetresizehandler.cpp \
qfocusframe.cpp \
qscrollarea.cpp \
qworkspace.cpp \
qwidgetanimator.cpp \
qtoolbararealayout.cpp \
qplaintextedit.cpp \
qprintpreviewwidget.cpp \
qprintdialog_unix.cpp \
qpagesetupdialog_unix.cpp \
qabstractprintdialog.cpp \
qabstractpagesetupdialog.cpp \
qcolordialog.cpp \
qdialog.cpp \
qerrormessage.cpp \
qfiledialog.cpp \
qfontdialog.cpp \
qinputdialog.cpp \
qmessagebox.cpp \
qprogressdialog.cpp \
qsidebar.cpp \
qfilesystemmodel.cpp \
qfileinfogatherer.cpp \
qpagesetupdialog.cpp \
qwizard.cpp \
qprintpreviewdialog.cpp \
qabstractitemview.cpp \
qheaderview.cpp \
qlistview.cpp \
qbsptree.cpp \
qtableview.cpp \
qtreeview.cpp \
qabstractitemdelegate.cpp \
qitemdelegate.cpp \
qitemselectionmodel.cpp \
qdirmodel.cpp \
qlistwidget.cpp \
qtablewidget.cpp \
qtreewidget.cpp \
qproxymodel.cpp \
qabstractproxymodel.cpp \
qsortfilterproxymodel.cpp \
qitemeditorfactory.cpp \
qstandarditemmodel.cpp \
qstringlistmodel.cpp \
qtreewidgetitemiterator.cpp \
qdatawidgetmapper.cpp \
qfileiconprovider.cpp \
qcolumnview.cpp \
qcolumnviewgrip.cpp \
qstyleditemdelegate.cpp \
qinputcontextfactory.cpp \
qinputcontextplugin.cpp \
qinputcontext.cpp \
qwsinputcontext_qws.cpp \
qgraphicsgridlayout.cpp \
qgraphicsitem.cpp \
qgraphicsitemanimation.cpp \
qgraphicslayout.cpp \
qgraphicslayout_p.cpp \
qgraphicslayoutitem.cpp \
qgraphicslinearlayout.cpp \
qgraphicsproxywidget.cpp \
qgraphicsscene.cpp \
qgraphicsscene_bsp.cpp \
qgraphicsscenebsptreeindex.cpp \
qgraphicssceneevent.cpp \
qgraphicssceneindex.cpp \
qgraphicsscenelinearindex.cpp \
qgraphicstransform.cpp \
qgraphicsview.cpp \
qgraphicswidget.cpp \
qgraphicswidget_p.cpp \
qgridlayoutengine.cpp \
qsimplex_p.cpp \
qgraphicsanchorlayout_p.cpp \
qgraphicsanchorlayout.cpp \
qsystemtrayicon.cpp \
qcompleter.cpp \
qdesktopservices.cpp \
qundogroup.cpp \
qundostack.cpp \
qundoview.cpp \
qsystemtrayicon_qws.cpp \
qguistatemachine.cpp \
qkeyeventtransition.cpp \
qmouseeventtransition.cpp \
qbasickeyeventtransition.cpp \
qbasicmouseeventtransition.cpp \
qgenericmatrix.cpp \
qmatrix4x4.cpp \
qquaternion.cpp \
qvector2d.cpp \
qvector3d.cpp \
qvector4d.cpp \
qgraphicseffect.cpp \
moc_qdecorationplugin_qws.cpp \
moc_qdirectpainter_qws.cpp \
moc_qwsmanager_qws.cpp \
moc_qwsembedwidget.cpp \
moc_qscreendriverplugin_qws.cpp \
moc_qkbddriverplugin_qws.cpp \
moc_qmousedriverplugin_qws.cpp \
moc_qboxlayout.cpp \
moc_qclipboard.cpp \
moc_qdesktopwidget.cpp \
moc_qdrag.cpp \
moc_qdnd_p.cpp \
moc_qformlayout.cpp \
moc_qgridlayout.cpp \
moc_qlayout.cpp \
moc_qshortcut.cpp \
moc_qsizepolicy.cpp \
moc_qpalette.cpp \
moc_qstackedlayout.cpp \
moc_qkeymapper_p.cpp \
moc_qsoftkeymanager_p.cpp \
moc_qguiplatformplugin_p.cpp \
moc_qeventdispatcher_qws_p.cpp \
moc_qiconengineplugin.cpp \
moc_qimageiohandler.cpp \
moc_qpictureformatplugin.cpp \
moc_qpixmapfilter_p.cpp \
moc_qbrush.cpp \
moc_qpainter.cpp \
moc_qpaintbuffer_p.cpp \
moc_qfont.cpp \
moc_qfontdatabase.cpp \
moc_qfont_p.cpp \
moc_qtextformat.cpp \
moc_qtextobject.cpp \
moc_qtextdocument.cpp \
moc_qtextimagehandler_p.cpp \
moc_qtexttable.cpp \
moc_qtextlist.cpp \
moc_qabstractfontengine_qws.cpp \
moc_qabstractfontengine_p.cpp \
moc_qstyle.cpp \
moc_qstyleplugin.cpp \
moc_qcommonstyle.cpp \
moc_qproxystyle.cpp \
moc_qcdestyle.cpp \
moc_qplastiquestyle.cpp \
moc_qcleanlooksstyle.cpp \
moc_qwindowsstyle.cpp \
moc_qmotifstyle.cpp \
moc_qbuttongroup.cpp \
moc_qabstractbutton.cpp \
moc_qabstractslider.cpp \
moc_qcalendartextnavigator_p.cpp \
moc_qcheckbox.cpp \
moc_qcombobox_p.cpp \
moc_qcommandlinkbutton.cpp \
moc_qdatetimeedit_p.cpp \
moc_qdial.cpp \
moc_qdockwidget_p.cpp \
moc_qframe.cpp \
moc_qlcdnumber.cpp \
moc_qlinecontrol_p.cpp \
moc_qmainwindow.cpp \
moc_qmainwindowlayout_p.cpp \
moc_qprogressbar.cpp \
moc_qradiobutton.cpp \
moc_qrubberband.cpp \
moc_qscrollbar.cpp \
moc_qslider.cpp \
moc_qspinbox.cpp \
moc_qsplashscreen.cpp \
moc_qsplitter.cpp \
moc_qstackedwidget.cpp \
moc_qstatusbar.cpp \
moc_qtabbar_p.cpp \
moc_qtoolbarlayout_p.cpp \
moc_qtoolbarextension_p.cpp \
moc_qtoolbarseparator_p.cpp \
moc_qvalidator.cpp \
moc_qwidgetresizehandler_p.cpp \
moc_qfocusframe.cpp \
moc_qscrollarea.cpp \
moc_qwidgetanimator_p.cpp \
moc_qerrormessage.cpp \
moc_qsidebar_p.cpp \
moc_qfileinfogatherer_p.cpp \
moc_qlistview.cpp \
moc_qabstractitemdelegate.cpp \
moc_qlistwidget_p.cpp \
moc_qtablewidget_p.cpp \
moc_qtreewidget_p.cpp \
moc_qitemeditorfactory_p.cpp \
moc_qstringlistmodel.cpp \
moc_qcolumnviewgrip_p.cpp \
moc_qinputcontextplugin.cpp \
moc_qinputcontext.cpp \
moc_qwsinputcontext_p.cpp \
moc_qgraphicsitemanimation.cpp \
moc_qgraphicsscenelinearindex_p.cpp \
moc_qgraphicswidget.cpp \
moc_qgraphicsanchorlayout.cpp \
moc_qsystemtrayicon.cpp \
moc_qcompleter_p.cpp \
moc_qsystemtrayicon_p.cpp \
moc_qundogroup.cpp \
moc_qundostack.cpp \
moc_qundostack_p.cpp \
moc_qundoview.cpp \
moc_qkeyeventtransition.cpp \
moc_qmouseeventtransition.cpp \
moc_qbasickeyeventtransition_p.cpp \
moc_qbasicmouseeventtransition_p.cpp \
moc_qgraphicseffect.cpp \
moc_qgraphicseffect_p.cpp \
qrc_qstyle.cpp \
qrc_qmessagebox.cpp
include $(REP_DIR)/lib/mk/qt_gui_generated.inc
# add Genode-specific sources
QT_SOURCES += qkbdpc101_qws.cpp \
@ -485,242 +21,41 @@ QT_SOURCES += qkbdpc101_qws.cpp \
qinputnitpicker_qws.cpp \
moc_qinputnitpicker_qws.cpp
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
# remove unneeded files to prevent moc warnings
COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \
moc_qsoundqss_qws.cpp \
moc_qcopchannel_qws.cpp \
moc_qtransportauth_qws.cpp \
moc_qtransportauth_qws_p.cpp \
moc_qwssocket_qws.cpp \
moc_qsessionmanager.cpp \
moc_qsound.cpp \
moc_qsound_p.cpp \
moc_qmenudata.cpp \
moc_qprintpreviewwidget.cpp \
moc_qabstractprintdialog.cpp \
moc_qabstractpagesetupdialog.cpp \
moc_qpagesetupdialog.cpp \
moc_qprintdialog.cpp \
moc_qprintpreviewdialog.cpp \
moc_qpagesetupdialog_unix_p.cpp
# source files generated from header files ("moc_%.cpp: %.h" rule in spec-qt4.mk)
# extracted from "compiler_moc_header_make_all" target
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qdecorationplugin_qws.cpp \
moc_qdirectpainter_qws.cpp \
moc_qwindowsystem_qws.cpp \
moc_qwsmanager_qws.cpp \
moc_qwsembedwidget.cpp \
moc_qscreendriverplugin_qws.cpp \
moc_qkbddriverplugin_qws.cpp \
moc_qmousedriverplugin_qws.cpp \
moc_qaction.cpp \
moc_qactiongroup.cpp \
moc_qapplication.cpp \
moc_qboxlayout.cpp \
moc_qclipboard.cpp \
moc_qdesktopwidget.cpp \
moc_qdrag.cpp \
moc_qdnd_p.cpp \
moc_qformlayout.cpp \
moc_qgridlayout.cpp \
moc_qlayout.cpp \
moc_qshortcut.cpp \
moc_qsizepolicy.cpp \
moc_qpalette.cpp \
moc_qstackedlayout.cpp \
moc_qwidget.cpp \
moc_qwidgetaction.cpp \
moc_qkeymapper_p.cpp \
moc_qgesture.cpp \
moc_qgesturemanager_p.cpp \
moc_qsoftkeymanager_p.cpp \
moc_qguiplatformplugin_p.cpp \
moc_qeventdispatcher_qws_p.cpp \
moc_qiconengineplugin.cpp \
moc_qimageiohandler.cpp \
moc_qmovie.cpp \
moc_qpictureformatplugin.cpp \
moc_qpixmapfilter_p.cpp \
moc_qbrush.cpp \
moc_qpainter.cpp \
moc_qpaintbuffer_p.cpp \
moc_qfont.cpp \
moc_qfontdatabase.cpp \
moc_qfont_p.cpp \
moc_qtextcontrol_p.cpp \
moc_qtextformat.cpp \
moc_qtextobject.cpp \
moc_qtextdocument.cpp \
moc_qabstracttextdocumentlayout.cpp \
moc_qtextdocumentlayout_p.cpp \
moc_qtextimagehandler_p.cpp \
moc_qtexttable.cpp \
moc_qtextlist.cpp \
moc_qsyntaxhighlighter.cpp \
moc_qabstractfontengine_qws.cpp \
moc_qabstractfontengine_p.cpp \
moc_qstyle.cpp \
moc_qstyleplugin.cpp \
moc_qcommonstyle.cpp \
moc_qproxystyle.cpp \
moc_qstylesheetstyle_p.cpp \
moc_qcdestyle.cpp \
moc_qplastiquestyle.cpp \
moc_qcleanlooksstyle.cpp \
moc_qwindowsstyle.cpp \
moc_qmotifstyle.cpp \
moc_qbuttongroup.cpp \
moc_qabstractbutton.cpp \
moc_qabstractslider.cpp \
moc_qabstractspinbox.cpp \
moc_qcalendartextnavigator_p.cpp \
moc_qcalendarwidget.cpp \
moc_qcheckbox.cpp \
moc_qcombobox.cpp \
moc_qcombobox_p.cpp \
moc_qcommandlinkbutton.cpp \
moc_qdatetimeedit.cpp \
moc_qdatetimeedit_p.cpp \
moc_qdial.cpp \
moc_qdialogbuttonbox.cpp \
moc_qdockwidget.cpp \
moc_qdockwidget_p.cpp \
moc_qfontcombobox.cpp \
moc_qframe.cpp \
moc_qgroupbox.cpp \
moc_qlabel.cpp \
moc_qlcdnumber.cpp \
moc_qlineedit.cpp \
moc_qlinecontrol_p.cpp \
moc_qmainwindow.cpp \
moc_qmainwindowlayout_p.cpp \
moc_qmdiarea.cpp \
moc_qmdisubwindow.cpp \
moc_qmenu.cpp \
moc_qmenubar.cpp \
moc_qprogressbar.cpp \
moc_qpushbutton.cpp \
moc_qradiobutton.cpp \
moc_qrubberband.cpp \
moc_qscrollbar.cpp \
moc_qsizegrip.cpp \
moc_qslider.cpp \
moc_qspinbox.cpp \
moc_qsplashscreen.cpp \
moc_qsplitter.cpp \
moc_qstackedwidget.cpp \
moc_qstatusbar.cpp \
moc_qtabbar.cpp \
moc_qtabbar_p.cpp \
moc_qtabwidget.cpp \
moc_qtextedit.cpp \
moc_qtextbrowser.cpp \
moc_qtoolbar.cpp \
moc_qtoolbarlayout_p.cpp \
moc_qtoolbarextension_p.cpp \
moc_qtoolbarseparator_p.cpp \
moc_qtoolbox.cpp \
moc_qtoolbutton.cpp \
moc_qvalidator.cpp \
moc_qabstractscrollarea.cpp \
moc_qabstractscrollarea_p.cpp \
moc_qwidgetresizehandler_p.cpp \
moc_qfocusframe.cpp \
moc_qscrollarea.cpp \
moc_qworkspace.cpp \
moc_qwidgetanimator_p.cpp \
moc_qplaintextedit.cpp \
moc_qplaintextedit_p.cpp \
moc_qcolordialog.cpp \
moc_qdialog.cpp \
moc_qerrormessage.cpp \
moc_qfiledialog.cpp \
moc_qfontdialog.cpp \
moc_qinputdialog.cpp \
moc_qmessagebox.cpp \
moc_qprogressdialog.cpp \
moc_qsidebar_p.cpp \
moc_qfilesystemmodel.cpp \
moc_qfileinfogatherer_p.cpp \
moc_qwizard.cpp \
moc_qabstractitemview.cpp \
moc_qheaderview.cpp \
moc_qlistview.cpp \
moc_qtableview.cpp \
moc_qtreeview.cpp \
moc_qabstractitemdelegate.cpp \
moc_qitemdelegate.cpp \
moc_qitemselectionmodel.cpp \
moc_qdirmodel.cpp \
moc_qlistwidget.cpp \
moc_qlistwidget_p.cpp \
moc_qtablewidget.cpp \
moc_qtablewidget_p.cpp \
moc_qtreewidget.cpp \
moc_qtreewidget_p.cpp \
moc_qproxymodel.cpp \
moc_qabstractproxymodel.cpp \
moc_qsortfilterproxymodel.cpp \
moc_qitemeditorfactory_p.cpp \
moc_qstandarditemmodel.cpp \
moc_qstringlistmodel.cpp \
moc_qdatawidgetmapper.cpp \
moc_qcolumnviewgrip_p.cpp \
moc_qcolumnview.cpp \
moc_qstyleditemdelegate.cpp \
moc_qinputcontextplugin.cpp \
moc_qinputcontext.cpp \
moc_qwsinputcontext_p.cpp \
moc_qgraphicsitem.cpp \
moc_qgraphicsitemanimation.cpp \
moc_qgraphicsproxywidget.cpp \
moc_qgraphicsscene.cpp \
moc_qgraphicsscenebsptreeindex_p.cpp \
moc_qgraphicssceneindex_p.cpp \
moc_qgraphicsscenelinearindex_p.cpp \
moc_qgraphicstransform.cpp \
moc_qgraphicsview.cpp \
moc_qgraphicswidget.cpp \
moc_qgraphicsanchorlayout.cpp \
moc_qsystemtrayicon.cpp \
moc_qcompleter.cpp \
moc_qcompleter_p.cpp \
moc_qsystemtrayicon_p.cpp \
moc_qundogroup.cpp \
moc_qundostack.cpp \
moc_qundostack_p.cpp \
moc_qundoview.cpp \
moc_qkeyeventtransition.cpp \
moc_qmouseeventtransition.cpp \
moc_qbasickeyeventtransition_p.cpp \
moc_qbasicmouseeventtransition_p.cpp \
moc_qgraphicseffect.cpp \
moc_qgraphicseffect_p.cpp
# source files generated from source files ("%.moc: %.cpp" rule in spec-qt4.mk)
# extracted from "compiler_moc_source_make_all" target
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
qkbd_qws.moc \
qtooltip.moc \
qwhatsthis.moc \
qpixmapcache.moc \
qcalendarwidget.moc \
qdockwidget.moc \
qeffects.moc \
qfontcombobox.moc \
qmdisubwindow.moc \
qmenu.moc \
qtoolbox.moc \
qworkspace.moc \
qcolordialog.moc \
qfontdialog.moc \
qinputdialog.moc \
qtableview.moc \
qlistwidget.moc \
qitemeditorfactory.moc \
qdesktopservices.moc \
qundoview.moc
COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \
qsoundqss_qws.moc \
qcopchannel_qws.moc \
qsound_qws.moc \
qprintpreviewwidget.moc \
qprintdialog_unix.moc \
qprintpreviewdialog.moc
# UI headers
qfiledialog.o: ui_qfiledialog.h
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
$(REP_DIR)/include/qt4/QtCore/private \
$(REP_DIR)/contrib/$(QT4)/include/QtCore/private \
$(REP_DIR)/include/qt4/QtGui/private \
INC_DIR += $(REP_DIR)/include/qt4/QtGui/private \
$(REP_DIR)/contrib/$(QT4)/include/QtGui/private \
$(REP_DIR)/src/lib/qt4/src/corelib/global \
$(REP_DIR)/contrib/$(QT4)/src/corelib/codecs \
$(REP_DIR)/contrib/$(QT4)/src/3rdparty/harfbuzz/src \
$(REP_DIR)/contrib/$(QT4)/src/gui/dialogs
$(REP_DIR)/contrib/$(QT4)/src/3rdparty/harfbuzz/src
LIBS += qt_core libpng zlib libc libm freetype
LIBS += qt_core libpng zlib libc libm freetype jpeg
vpath % $(REP_DIR)/include/qt4/QtGui
vpath % $(REP_DIR)/include/qt4/QtGui/private
@ -762,4 +97,4 @@ vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/util
vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/statemachine
vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/math3d
include $(REP_DIR)/lib/mk/qt.mk
include $(REP_DIR)/lib/mk/qt.inc

View File

@ -0,0 +1,725 @@
QT_SOURCES = \
qsoundqss_qws.cpp \
qcopchannel_qws.cpp \
qdecoration_qws.cpp \
qdecorationfactory_qws.cpp \
qdecorationplugin_qws.cpp \
qdirectpainter_qws.cpp \
qlock.cpp \
qscreen_qws.cpp \
qscreenmulti_qws.cpp \
qscreenproxy_qws.cpp \
qwindowsystem_qws.cpp \
qwscommand_qws.cpp \
qwscursor_qws.cpp \
qwsevent_qws.cpp \
qwsmanager_qws.cpp \
qwsproperty_qws.cpp \
qtransportauth_qws.cpp \
qwslock.cpp \
qwssharedmemory.cpp \
qwssocket_qws.cpp \
qwssignalhandler.cpp \
qwsembedwidget.cpp \
qdecorationdefault_qws.cpp \
qdecorationstyled_qws.cpp \
qdecorationwindows_qws.cpp \
qscreendriverplugin_qws.cpp \
qscreendriverfactory_qws.cpp \
qkbd_qws.cpp \
qkbddriverplugin_qws.cpp \
qkbddriverfactory_qws.cpp \
qmouse_qws.cpp \
qmousedriverplugin_qws.cpp \
qmousedriverfactory_qws.cpp \
qguivariantanimation.cpp \
qaction.cpp \
qactiongroup.cpp \
qapplication.cpp \
qboxlayout.cpp \
qclipboard.cpp \
qcursor.cpp \
qdrag.cpp \
qdnd.cpp \
qevent.cpp \
qformlayout.cpp \
qgridlayout.cpp \
qkeysequence.cpp \
qlayout.cpp \
qlayoutengine.cpp \
qlayoutitem.cpp \
qmime.cpp \
qpalette.cpp \
qshortcut.cpp \
qshortcutmap.cpp \
qsound.cpp \
qstackedlayout.cpp \
qtooltip.cpp \
qguivariant.cpp \
qwhatsthis.cpp \
qwidget.cpp \
qwidgetaction.cpp \
qkeymapper.cpp \
qgesture.cpp \
qstandardgestures.cpp \
qgesturerecognizer.cpp \
qgesturemanager.cpp \
qsoftkeymanager.cpp \
qdesktopwidget.cpp \
qguiplatformplugin.cpp \
qapplication_qws.cpp \
qclipboard_qws.cpp \
qcursor_qws.cpp \
qdesktopwidget_qws.cpp \
qdnd_qws.cpp \
qeventdispatcher_qws.cpp \
qsound_qws.cpp \
qwidget_qws.cpp \
qkeymapper_qws.cpp \
qsessionmanager_qws.cpp \
qbitmap.cpp \
qicon.cpp \
qiconloader.cpp \
qimage.cpp \
qimageiohandler.cpp \
qimagereader.cpp \
qimagewriter.cpp \
qpaintengine_pic.cpp \
qpicture.cpp \
qpictureformatplugin.cpp \
qpixmap.cpp \
qpixmapcache.cpp \
qpixmapdata.cpp \
qpixmapdatafactory.cpp \
qpixmapfilter.cpp \
qiconengine.cpp \
qiconengineplugin.cpp \
qmovie.cpp \
qpixmap_raster.cpp \
qnativeimage.cpp \
qimagepixmapcleanuphooks.cpp \
qvolatileimage.cpp \
qpixmap_qws.cpp \
qvolatileimagedata.cpp \
qbmphandler.cpp \
qppmhandler.cpp \
qxbmhandler.cpp \
qxpmhandler.cpp \
qpnghandler.cpp \
qjpeghandler.cpp \
qgifhandler.cpp \
qbezier.cpp \
qblendfunctions.cpp \
qbrush.cpp \
qcolor.cpp \
qcolor_p.cpp \
qcssutil.cpp \
qdrawutil.cpp \
qemulationpaintengine.cpp \
qgraphicssystem.cpp \
qmatrix.cpp \
qmemrotate.cpp \
qoutlinemapper.cpp \
qpaintdevice.cpp \
qpaintengine.cpp \
qpaintengine_alpha.cpp \
qpaintengine_preview.cpp \
qpaintengineex.cpp \
qpainter.cpp \
qpainterpath.cpp \
qpathclipper.cpp \
qpdf.cpp \
qpen.cpp \
qpolygon.cpp \
qprintengine_pdf.cpp \
qprintengine_ps.cpp \
qprinter.cpp \
qrasterizer.cpp \
qregion.cpp \
qstroker.cpp \
qstylepainter.cpp \
qtessellator.cpp \
qtextureglyphcache.cpp \
qtransform.cpp \
qwindowsurface.cpp \
qpaintbuffer.cpp \
qpaintengine_raster.cpp \
qdrawhelper.cpp \
qimagescale.cpp \
qgrayraster.c \
qgraphicssystem_qws.cpp \
qprinterinfo_unix.cpp \
qbackingstore.cpp \
qcolormap_qws.cpp \
qpaintdevice_qws.cpp \
qcups.cpp \
qwindowsurface_qws.cpp \
qfont.cpp \
qfontengine.cpp \
qfontsubset.cpp \
qfontmetrics.cpp \
qfontdatabase.cpp \
qtextcontrol.cpp \
qtextengine.cpp \
qtextlayout.cpp \
qtextformat.cpp \
qtextobject.cpp \
qtextoption.cpp \
qfragmentmap.cpp \
qtextdocument.cpp \
qtextdocument_p.cpp \
qtexthtmlparser.cpp \
qabstracttextdocumentlayout.cpp \
qtextdocumentlayout.cpp \
qtextcursor.cpp \
qtextdocumentfragment.cpp \
qtextimagehandler.cpp \
qtexttable.cpp \
qtextlist.cpp \
qtextdocumentwriter.cpp \
qsyntaxhighlighter.cpp \
qcssparser.cpp \
qzip.cpp \
qtextodfwriter.cpp \
qstatictext.cpp \
qfont_qws.cpp \
qfontengine_qws.cpp \
qfontengine_ft.cpp \
qfontengine_qpf.cpp \
qabstractfontengine_qws.cpp \
qstyle.cpp \
qstylefactory.cpp \
qstyleoption.cpp \
qstyleplugin.cpp \
qstylehelper.cpp \
qcommonstyle.cpp \
qproxystyle.cpp \
qstylesheetstyle.cpp \
qstylesheetstyle_default.cpp \
qcdestyle.cpp \
qplastiquestyle.cpp \
qcleanlooksstyle.cpp \
qwindowsstyle.cpp \
qmotifstyle.cpp \
qabstractbutton.cpp \
qabstractslider.cpp \
qabstractspinbox.cpp \
qcalendarwidget.cpp \
qcheckbox.cpp \
qcombobox.cpp \
qcommandlinkbutton.cpp \
qdatetimeedit.cpp \
qdial.cpp \
qdialogbuttonbox.cpp \
qdockwidget.cpp \
qdockarealayout.cpp \
qeffects.cpp \
qfontcombobox.cpp \
qframe.cpp \
qgroupbox.cpp \
qlabel.cpp \
qlcdnumber.cpp \
qlineedit_p.cpp \
qlineedit.cpp \
qlinecontrol.cpp \
qmainwindow.cpp \
qmainwindowlayout.cpp \
qmdiarea.cpp \
qmdisubwindow.cpp \
qmenu.cpp \
qmenubar.cpp \
qmenudata.cpp \
qprogressbar.cpp \
qpushbutton.cpp \
qradiobutton.cpp \
qrubberband.cpp \
qscrollbar.cpp \
qsizegrip.cpp \
qslider.cpp \
qspinbox.cpp \
qsplashscreen.cpp \
qsplitter.cpp \
qstackedwidget.cpp \
qstatusbar.cpp \
qtabbar.cpp \
qtabwidget.cpp \
qtextedit.cpp \
qtextbrowser.cpp \
qtoolbar.cpp \
qtoolbarlayout.cpp \
qtoolbarextension.cpp \
qtoolbarseparator.cpp \
qtoolbox.cpp \
qtoolbutton.cpp \
qvalidator.cpp \
qabstractscrollarea.cpp \
qwidgetresizehandler.cpp \
qfocusframe.cpp \
qscrollarea.cpp \
qworkspace.cpp \
qwidgetanimator.cpp \
qtoolbararealayout.cpp \
qplaintextedit.cpp \
qprintpreviewwidget.cpp \
qprintdialog_unix.cpp \
qpagesetupdialog_unix.cpp \
qabstractprintdialog.cpp \
qabstractpagesetupdialog.cpp \
qcolordialog.cpp \
qdialog.cpp \
qerrormessage.cpp \
qfiledialog.cpp \
qfontdialog.cpp \
qinputdialog.cpp \
qmessagebox.cpp \
qprogressdialog.cpp \
qsidebar.cpp \
qfilesystemmodel.cpp \
qfileinfogatherer.cpp \
qpagesetupdialog.cpp \
qwizard.cpp \
qprintpreviewdialog.cpp \
qabstractitemview.cpp \
qheaderview.cpp \
qlistview.cpp \
qbsptree.cpp \
qtableview.cpp \
qtreeview.cpp \
qabstractitemdelegate.cpp \
qitemdelegate.cpp \
qitemselectionmodel.cpp \
qdirmodel.cpp \
qlistwidget.cpp \
qtablewidget.cpp \
qtreewidget.cpp \
qproxymodel.cpp \
qabstractproxymodel.cpp \
qsortfilterproxymodel.cpp \
qitemeditorfactory.cpp \
qstandarditemmodel.cpp \
qstringlistmodel.cpp \
qtreewidgetitemiterator.cpp \
qdatawidgetmapper.cpp \
qfileiconprovider.cpp \
qcolumnview.cpp \
qcolumnviewgrip.cpp \
qstyleditemdelegate.cpp \
qinputcontextfactory.cpp \
qinputcontextplugin.cpp \
qinputcontext.cpp \
qwsinputcontext_qws.cpp \
qgraphicsgridlayout.cpp \
qgraphicsitem.cpp \
qgraphicsitemanimation.cpp \
qgraphicslayout.cpp \
qgraphicslayout_p.cpp \
qgraphicslayoutitem.cpp \
qgraphicslinearlayout.cpp \
qgraphicsproxywidget.cpp \
qgraphicsscene.cpp \
qgraphicsscene_bsp.cpp \
qgraphicsscenebsptreeindex.cpp \
qgraphicssceneevent.cpp \
qgraphicssceneindex.cpp \
qgraphicsscenelinearindex.cpp \
qgraphicstransform.cpp \
qgraphicsview.cpp \
qgraphicswidget.cpp \
qgraphicswidget_p.cpp \
qgridlayoutengine.cpp \
qsimplex_p.cpp \
qgraphicsanchorlayout_p.cpp \
qgraphicsanchorlayout.cpp \
qsystemtrayicon.cpp \
qcompleter.cpp \
qdesktopservices.cpp \
qundogroup.cpp \
qundostack.cpp \
qundoview.cpp \
qsystemtrayicon_qws.cpp \
qguistatemachine.cpp \
qkeyeventtransition.cpp \
qmouseeventtransition.cpp \
qbasickeyeventtransition.cpp \
qbasicmouseeventtransition.cpp \
qgenericmatrix.cpp \
qmatrix4x4.cpp \
qquaternion.cpp \
qvector2d.cpp \
qvector3d.cpp \
qvector4d.cpp \
qgraphicseffect.cpp \
moc_qsoundqss_qws.cpp \
moc_qcopchannel_qws.cpp \
moc_qdecorationplugin_qws.cpp \
moc_qdirectpainter_qws.cpp \
moc_qwsmanager_qws.cpp \
moc_qtransportauth_qws.cpp \
moc_qwssocket_qws.cpp \
moc_qwsembedwidget.cpp \
moc_qscreendriverplugin_qws.cpp \
moc_qkbddriverplugin_qws.cpp \
moc_qmousedriverplugin_qws.cpp \
moc_qboxlayout.cpp \
moc_qclipboard.cpp \
moc_qdesktopwidget.cpp \
moc_qdrag.cpp \
moc_qdnd_p.cpp \
moc_qformlayout.cpp \
moc_qgridlayout.cpp \
moc_qlayout.cpp \
moc_qsessionmanager.cpp \
moc_qshortcut.cpp \
moc_qsizepolicy.cpp \
moc_qpalette.cpp \
moc_qsound.cpp \
moc_qsound_p.cpp \
moc_qstackedlayout.cpp \
moc_qkeymapper_p.cpp \
moc_qsoftkeymanager_p.cpp \
moc_qguiplatformplugin_p.cpp \
moc_qeventdispatcher_qws_p.cpp \
moc_qiconengineplugin.cpp \
moc_qimageiohandler.cpp \
moc_qpictureformatplugin.cpp \
moc_qpixmapfilter_p.cpp \
moc_qbrush.cpp \
moc_qpainter.cpp \
moc_qpaintbuffer_p.cpp \
moc_qfont.cpp \
moc_qfontdatabase.cpp \
moc_qfont_p.cpp \
moc_qtextformat.cpp \
moc_qtextobject.cpp \
moc_qtextdocument.cpp \
moc_qtextimagehandler_p.cpp \
moc_qtexttable.cpp \
moc_qtextlist.cpp \
moc_qabstractfontengine_qws.cpp \
moc_qabstractfontengine_p.cpp \
moc_qstyle.cpp \
moc_qstyleplugin.cpp \
moc_qcommonstyle.cpp \
moc_qproxystyle.cpp \
moc_qcdestyle.cpp \
moc_qplastiquestyle.cpp \
moc_qcleanlooksstyle.cpp \
moc_qwindowsstyle.cpp \
moc_qmotifstyle.cpp \
moc_qbuttongroup.cpp \
moc_qabstractbutton.cpp \
moc_qabstractslider.cpp \
moc_qcalendartextnavigator_p.cpp \
moc_qcheckbox.cpp \
moc_qcombobox_p.cpp \
moc_qcommandlinkbutton.cpp \
moc_qdatetimeedit_p.cpp \
moc_qdial.cpp \
moc_qdockwidget_p.cpp \
moc_qframe.cpp \
moc_qlcdnumber.cpp \
moc_qlinecontrol_p.cpp \
moc_qmainwindow.cpp \
moc_qmainwindowlayout_p.cpp \
moc_qmenudata.cpp \
moc_qprogressbar.cpp \
moc_qradiobutton.cpp \
moc_qrubberband.cpp \
moc_qscrollbar.cpp \
moc_qslider.cpp \
moc_qspinbox.cpp \
moc_qsplashscreen.cpp \
moc_qsplitter.cpp \
moc_qstackedwidget.cpp \
moc_qstatusbar.cpp \
moc_qtabbar_p.cpp \
moc_qtoolbarlayout_p.cpp \
moc_qtoolbarextension_p.cpp \
moc_qtoolbarseparator_p.cpp \
moc_qvalidator.cpp \
moc_qwidgetresizehandler_p.cpp \
moc_qfocusframe.cpp \
moc_qscrollarea.cpp \
moc_qwidgetanimator_p.cpp \
moc_qabstractprintdialog.cpp \
moc_qabstractpagesetupdialog.cpp \
moc_qerrormessage.cpp \
moc_qsidebar_p.cpp \
moc_qfileinfogatherer_p.cpp \
moc_qpagesetupdialog_unix_p.cpp \
moc_qlistview.cpp \
moc_qabstractitemdelegate.cpp \
moc_qlistwidget_p.cpp \
moc_qtablewidget_p.cpp \
moc_qtreewidget_p.cpp \
moc_qitemeditorfactory_p.cpp \
moc_qstringlistmodel.cpp \
moc_qcolumnviewgrip_p.cpp \
moc_qinputcontextplugin.cpp \
moc_qinputcontext.cpp \
moc_qwsinputcontext_p.cpp \
moc_qgraphicsitemanimation.cpp \
moc_qgraphicsscenelinearindex_p.cpp \
moc_qgraphicsanchorlayout.cpp \
moc_qsystemtrayicon.cpp \
moc_qcompleter_p.cpp \
moc_qsystemtrayicon_p.cpp \
moc_qundogroup.cpp \
moc_qundostack.cpp \
moc_qundostack_p.cpp \
moc_qundoview.cpp \
moc_qkeyeventtransition.cpp \
moc_qmouseeventtransition.cpp \
moc_qbasickeyeventtransition_p.cpp \
moc_qbasicmouseeventtransition_p.cpp \
moc_qgraphicseffect.cpp \
moc_qgraphicseffect_p.cpp \
qrc_qstyle.cpp \
qrc_qmessagebox.cpp
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
# source files generated from existing header files ('moc_%.cpp: %.h' rule in spec-qt4.mk)
# extracted from 'compiler_moc_header_make_all' target
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qsoundqss_qws.cpp \
moc_qcopchannel_qws.cpp \
moc_qdecorationplugin_qws.cpp \
moc_qdirectpainter_qws.cpp \
moc_qwindowsystem_qws.cpp \
moc_qwsmanager_qws.cpp \
moc_qtransportauth_qws.cpp \
moc_qtransportauth_qws_p.cpp \
moc_qwssocket_qws.cpp \
moc_qwsembedwidget.cpp \
moc_qscreendriverplugin_qws.cpp \
moc_qkbddriverplugin_qws.cpp \
moc_qmousedriverplugin_qws.cpp \
moc_qaction.cpp \
moc_qactiongroup.cpp \
moc_qapplication.cpp \
moc_qboxlayout.cpp \
moc_qclipboard.cpp \
moc_qdesktopwidget.cpp \
moc_qdrag.cpp \
moc_qdnd_p.cpp \
moc_qformlayout.cpp \
moc_qgridlayout.cpp \
moc_qlayout.cpp \
moc_qsessionmanager.cpp \
moc_qshortcut.cpp \
moc_qsizepolicy.cpp \
moc_qpalette.cpp \
moc_qsound.cpp \
moc_qsound_p.cpp \
moc_qstackedlayout.cpp \
moc_qwidget.cpp \
moc_qwidgetaction.cpp \
moc_qkeymapper_p.cpp \
moc_qgesture.cpp \
moc_qgesturemanager_p.cpp \
moc_qsoftkeymanager_p.cpp \
moc_qguiplatformplugin_p.cpp \
moc_qeventdispatcher_qws_p.cpp \
moc_qiconengineplugin.cpp \
moc_qimageiohandler.cpp \
moc_qmovie.cpp \
moc_qpictureformatplugin.cpp \
moc_qpixmapfilter_p.cpp \
moc_qbrush.cpp \
moc_qpainter.cpp \
moc_qpaintbuffer_p.cpp \
moc_qfont.cpp \
moc_qfontdatabase.cpp \
moc_qfont_p.cpp \
moc_qtextcontrol_p.cpp \
moc_qtextformat.cpp \
moc_qtextobject.cpp \
moc_qtextdocument.cpp \
moc_qabstracttextdocumentlayout.cpp \
moc_qtextdocumentlayout_p.cpp \
moc_qtextimagehandler_p.cpp \
moc_qtexttable.cpp \
moc_qtextlist.cpp \
moc_qsyntaxhighlighter.cpp \
moc_qabstractfontengine_qws.cpp \
moc_qabstractfontengine_p.cpp \
moc_qstyle.cpp \
moc_qstyleplugin.cpp \
moc_qcommonstyle.cpp \
moc_qproxystyle.cpp \
moc_qstylesheetstyle_p.cpp \
moc_qcdestyle.cpp \
moc_qplastiquestyle.cpp \
moc_qcleanlooksstyle.cpp \
moc_qwindowsstyle.cpp \
moc_qmotifstyle.cpp \
moc_qbuttongroup.cpp \
moc_qabstractbutton.cpp \
moc_qabstractslider.cpp \
moc_qabstractspinbox.cpp \
moc_qcalendartextnavigator_p.cpp \
moc_qcalendarwidget.cpp \
moc_qcheckbox.cpp \
moc_qcombobox.cpp \
moc_qcombobox_p.cpp \
moc_qcommandlinkbutton.cpp \
moc_qdatetimeedit.cpp \
moc_qdatetimeedit_p.cpp \
moc_qdial.cpp \
moc_qdialogbuttonbox.cpp \
moc_qdockwidget.cpp \
moc_qdockwidget_p.cpp \
moc_qfontcombobox.cpp \
moc_qframe.cpp \
moc_qgroupbox.cpp \
moc_qlabel.cpp \
moc_qlcdnumber.cpp \
moc_qlineedit.cpp \
moc_qlinecontrol_p.cpp \
moc_qmainwindow.cpp \
moc_qmainwindowlayout_p.cpp \
moc_qmdiarea.cpp \
moc_qmdisubwindow.cpp \
moc_qmenu.cpp \
moc_qmenubar.cpp \
moc_qmenudata.cpp \
moc_qprogressbar.cpp \
moc_qpushbutton.cpp \
moc_qradiobutton.cpp \
moc_qrubberband.cpp \
moc_qscrollbar.cpp \
moc_qsizegrip.cpp \
moc_qslider.cpp \
moc_qspinbox.cpp \
moc_qsplashscreen.cpp \
moc_qsplitter.cpp \
moc_qstackedwidget.cpp \
moc_qstatusbar.cpp \
moc_qtabbar.cpp \
moc_qtabbar_p.cpp \
moc_qtabwidget.cpp \
moc_qtextedit.cpp \
moc_qtextbrowser.cpp \
moc_qtoolbar.cpp \
moc_qtoolbarlayout_p.cpp \
moc_qtoolbarextension_p.cpp \
moc_qtoolbarseparator_p.cpp \
moc_qtoolbox.cpp \
moc_qtoolbutton.cpp \
moc_qvalidator.cpp \
moc_qabstractscrollarea.cpp \
moc_qabstractscrollarea_p.cpp \
moc_qwidgetresizehandler_p.cpp \
moc_qfocusframe.cpp \
moc_qscrollarea.cpp \
moc_qworkspace.cpp \
moc_qwidgetanimator_p.cpp \
moc_qplaintextedit.cpp \
moc_qplaintextedit_p.cpp \
moc_qprintpreviewwidget.cpp \
moc_qabstractprintdialog.cpp \
moc_qabstractpagesetupdialog.cpp \
moc_qcolordialog.cpp \
moc_qdialog.cpp \
moc_qerrormessage.cpp \
moc_qfiledialog.cpp \
moc_qfontdialog.cpp \
moc_qinputdialog.cpp \
moc_qmessagebox.cpp \
moc_qpagesetupdialog.cpp \
moc_qprintdialog.cpp \
moc_qprogressdialog.cpp \
moc_qsidebar_p.cpp \
moc_qfilesystemmodel.cpp \
moc_qfileinfogatherer_p.cpp \
moc_qwizard.cpp \
moc_qprintpreviewdialog.cpp \
moc_qpagesetupdialog_unix_p.cpp \
moc_qabstractitemview.cpp \
moc_qheaderview.cpp \
moc_qlistview.cpp \
moc_qtableview.cpp \
moc_qtreeview.cpp \
moc_qabstractitemdelegate.cpp \
moc_qitemdelegate.cpp \
moc_qitemselectionmodel.cpp \
moc_qdirmodel.cpp \
moc_qlistwidget.cpp \
moc_qlistwidget_p.cpp \
moc_qtablewidget.cpp \
moc_qtablewidget_p.cpp \
moc_qtreewidget.cpp \
moc_qtreewidget_p.cpp \
moc_qproxymodel.cpp \
moc_qabstractproxymodel.cpp \
moc_qsortfilterproxymodel.cpp \
moc_qitemeditorfactory_p.cpp \
moc_qstandarditemmodel.cpp \
moc_qstringlistmodel.cpp \
moc_qdatawidgetmapper.cpp \
moc_qcolumnviewgrip_p.cpp \
moc_qcolumnview.cpp \
moc_qstyleditemdelegate.cpp \
moc_qinputcontextplugin.cpp \
moc_qinputcontext.cpp \
moc_qwsinputcontext_p.cpp \
moc_qgraphicsitem.cpp \
moc_qgraphicsitemanimation.cpp \
moc_qgraphicsproxywidget.cpp \
moc_qgraphicsscene.cpp \
moc_qgraphicsscenebsptreeindex_p.cpp \
moc_qgraphicssceneindex_p.cpp \
moc_qgraphicsscenelinearindex_p.cpp \
moc_qgraphicstransform.cpp \
moc_qgraphicsview.cpp \
moc_qgraphicswidget.cpp \
moc_qgraphicsanchorlayout.cpp \
moc_qsystemtrayicon.cpp \
moc_qcompleter.cpp \
moc_qcompleter_p.cpp \
moc_qsystemtrayicon_p.cpp \
moc_qundogroup.cpp \
moc_qundostack.cpp \
moc_qundostack_p.cpp \
moc_qundoview.cpp \
moc_qkeyeventtransition.cpp \
moc_qmouseeventtransition.cpp \
moc_qbasickeyeventtransition_p.cpp \
moc_qbasicmouseeventtransition_p.cpp \
moc_qgraphicseffect.cpp \
moc_qgraphicseffect_p.cpp
# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk)
# extracted from 'compiler_moc_source_make_all' rule
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
qsoundqss_qws.moc \
qcopchannel_qws.moc \
qkbd_qws.moc \
qtooltip.moc \
qwhatsthis.moc \
qsound_qws.moc \
qpixmapcache.moc \
qcalendarwidget.moc \
qdockwidget.moc \
qeffects.moc \
qfontcombobox.moc \
qmdisubwindow.moc \
qmenu.moc \
qtoolbox.moc \
qworkspace.moc \
qprintpreviewwidget.moc \
qprintdialog_unix.moc \
qcolordialog.moc \
qfontdialog.moc \
qinputdialog.moc \
qprintpreviewdialog.moc \
qtableview.moc \
qlistwidget.moc \
qitemeditorfactory.moc \
qdesktopservices.moc \
qundoview.moc

View File

@ -14,190 +14,9 @@ CC_CXX_OPT += -D_GLIBCXX_USE_C99_MATH
# use default warning level to avoid noise when compiling contrib code
CC_WARN =
# extracted from src/3rdparty/webkit/JavaScriptCore/Makefile
QT_SOURCES = \
pcre_compile.cpp \
pcre_exec.cpp \
pcre_tables.cpp \
pcre_ucp_searchfuncs.cpp \
pcre_xclass.cpp \
JSBase.cpp \
JSCallbackConstructor.cpp \
JSCallbackFunction.cpp \
JSCallbackObject.cpp \
JSClassRef.cpp \
JSContextRef.cpp \
JSObjectRef.cpp \
JSStringRef.cpp \
JSValueRef.cpp \
OpaqueJSString.cpp \
ARMAssembler.cpp \
MacroAssemblerARM.cpp \
CodeBlock.cpp \
JumpTable.cpp \
Opcode.cpp \
SamplingTool.cpp \
StructureStubInfo.cpp \
BytecodeGenerator.cpp \
NodesCodegen.cpp \
DebuggerActivation.cpp \
DebuggerCallFrame.cpp \
Debugger.cpp \
CallFrame.cpp \
Interpreter.cpp \
RegisterFile.cpp \
ExecutableAllocatorFixedVMPool.cpp \
ExecutableAllocatorPosix.cpp \
ExecutableAllocatorSymbian.cpp \
ExecutableAllocatorWin.cpp \
ExecutableAllocator.cpp \
JITArithmetic.cpp \
JITCall.cpp \
JIT.cpp \
JITOpcodes.cpp \
JITPropertyAccess.cpp \
JITPropertyAccess32_64.cpp \
JITStubs.cpp \
Lexer.cpp \
Nodes.cpp \
ParserArena.cpp \
Parser.cpp \
Profile.cpp \
ProfileGenerator.cpp \
ProfileNode.cpp \
Profiler.cpp \
ArgList.cpp \
Arguments.cpp \
ArrayConstructor.cpp \
ArrayPrototype.cpp \
BooleanConstructor.cpp \
BooleanObject.cpp \
BooleanPrototype.cpp \
CallData.cpp \
Collector.cpp \
CommonIdentifiers.cpp \
Completion.cpp \
ConstructData.cpp \
DateConstructor.cpp \
DateConversion.cpp \
DateInstance.cpp \
DatePrototype.cpp \
ErrorConstructor.cpp \
Error.cpp \
ErrorInstance.cpp \
ErrorPrototype.cpp \
ExceptionHelpers.cpp \
Executable.cpp \
FunctionConstructor.cpp \
FunctionPrototype.cpp \
GetterSetter.cpp \
GlobalEvalFunction.cpp \
Identifier.cpp \
InitializeThreading.cpp \
InternalFunction.cpp \
JSActivation.cpp \
JSAPIValueWrapper.cpp \
JSArray.cpp \
JSByteArray.cpp \
JSCell.cpp \
JSFunction.cpp \
JSGlobalData.cpp \
JSGlobalObject.cpp \
JSGlobalObjectFunctions.cpp \
JSImmediate.cpp \
JSLock.cpp \
JSNotAnObject.cpp \
JSNumberCell.cpp \
JSObject.cpp \
JSONObject.cpp \
JSPropertyNameIterator.cpp \
JSStaticScopeObject.cpp \
JSString.cpp \
JSValue.cpp \
JSVariableObject.cpp \
JSWrapperObject.cpp \
LiteralParser.cpp \
Lookup.cpp \
MarkStackPosix.cpp \
MarkStackSymbian.cpp \
MarkStackWin.cpp \
MarkStack.cpp \
MathObject.cpp \
NativeErrorConstructor.cpp \
NativeErrorPrototype.cpp \
NumberConstructor.cpp \
NumberObject.cpp \
NumberPrototype.cpp \
ObjectConstructor.cpp \
ObjectPrototype.cpp \
Operations.cpp \
PropertyDescriptor.cpp \
PropertyNameArray.cpp \
PropertySlot.cpp \
PrototypeFunction.cpp \
RegExpConstructor.cpp \
RegExp.cpp \
RegExpObject.cpp \
RegExpPrototype.cpp \
ScopeChain.cpp \
SmallStrings.cpp \
StringConstructor.cpp \
StringObject.cpp \
StringPrototype.cpp \
StructureChain.cpp \
Structure.cpp \
TimeoutChecker.cpp \
UString.cpp \
UStringImpl.cpp \
Assertions.cpp \
ByteArray.cpp \
CurrentTime.cpp \
DateMath.cpp \
dtoa.cpp \
FastMalloc.cpp \
HashTable.cpp \
MainThread.cpp \
MainThreadQt.cpp \
ThreadingQt.cpp \
RandomNumber.cpp \
RefCountedLeakCounter.cpp \
RegisterFileAllocatorSymbian.cpp \
BlockAllocatorSymbian.cpp \
ThreadingNone.cpp \
Threading.cpp \
TypeTraits.cpp \
CollatorDefault.cpp \
CollatorICU.cpp \
UTF8.cpp \
RegexCompiler.cpp \
RegexInterpreter.cpp \
RegexJIT.cpp \
Grammar.cpp \
TCSystemAlloc.cpp
include $(REP_DIR)/lib/mk/qt_jscore_generated.inc
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
# source files generated from existing header files ("moc_%.cpp: %.h" rule in spec-qt4.mk)
# extracted from "compiler_moc_header_make_all" target
COMPILER_MOC_HEADER_MAKE_ALL_FILES =
# source files generated from existing source files ("%.moc: %.cpp" rule in spec-qt4.mk)
# extracted from "compiler_moc_source_make_all" rule
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
MainThreadQt.moc \
ThreadingQt.moc
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
$(REP_DIR)/include/qt4 \
$(REP_DIR)/contrib/$(QT4)/include \
$(REP_DIR)/include/qt4/QtCore \
$(REP_DIR)/contrib/$(QT4)/include/QtCore \
$(REP_DIR)/include/qt4/QtCore/private \
$(REP_DIR)/contrib/$(QT4)/include/QtCore/private \
$(REP_DIR)/include/qt4/QtNetwork \
$(REP_DIR)/contrib/$(QT4)/include/QtNetwork \
$(REP_DIR)/src/lib/qt4/src/3rdparty/webkit \
INC_DIR += $(REP_DIR)/src/lib/qt4/src/3rdparty/webkit \
$(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit \
$(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore \
$(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore \
@ -234,8 +53,7 @@ INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
$(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/ForwardingHeaders \
$(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/ForwardingHeaders \
$(REP_DIR)/src/lib/qt4/src/3rdparty/webkit/JavaScriptCore/generated \
$(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/generated \
$(REP_DIR)/src/lib/qt4/src/corelib/global
$(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/generated
LIBS += qt_network qt_core libc libm
@ -279,4 +97,4 @@ vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/wtf/unicode
vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/yarr
vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/generated
include $(REP_DIR)/lib/mk/qt.mk
include $(REP_DIR)/lib/mk/qt.inc

View File

@ -0,0 +1,176 @@
QT_SOURCES = \
pcre_compile.cpp \
pcre_exec.cpp \
pcre_tables.cpp \
pcre_ucp_searchfuncs.cpp \
pcre_xclass.cpp \
JSBase.cpp \
JSCallbackConstructor.cpp \
JSCallbackFunction.cpp \
JSCallbackObject.cpp \
JSClassRef.cpp \
JSContextRef.cpp \
JSObjectRef.cpp \
JSStringRef.cpp \
JSValueRef.cpp \
OpaqueJSString.cpp \
ARMAssembler.cpp \
MacroAssemblerARM.cpp \
CodeBlock.cpp \
JumpTable.cpp \
Opcode.cpp \
SamplingTool.cpp \
StructureStubInfo.cpp \
BytecodeGenerator.cpp \
NodesCodegen.cpp \
DebuggerActivation.cpp \
DebuggerCallFrame.cpp \
Debugger.cpp \
CallFrame.cpp \
Interpreter.cpp \
RegisterFile.cpp \
ExecutableAllocatorFixedVMPool.cpp \
ExecutableAllocatorPosix.cpp \
ExecutableAllocatorSymbian.cpp \
ExecutableAllocatorWin.cpp \
ExecutableAllocator.cpp \
JITArithmetic.cpp \
JITCall.cpp \
JIT.cpp \
JITOpcodes.cpp \
JITPropertyAccess.cpp \
JITPropertyAccess32_64.cpp \
JITStubs.cpp \
Lexer.cpp \
Nodes.cpp \
ParserArena.cpp \
Parser.cpp \
Profile.cpp \
ProfileGenerator.cpp \
ProfileNode.cpp \
Profiler.cpp \
ArgList.cpp \
Arguments.cpp \
ArrayConstructor.cpp \
ArrayPrototype.cpp \
BooleanConstructor.cpp \
BooleanObject.cpp \
BooleanPrototype.cpp \
CallData.cpp \
Collector.cpp \
CommonIdentifiers.cpp \
Completion.cpp \
ConstructData.cpp \
DateConstructor.cpp \
DateConversion.cpp \
DateInstance.cpp \
DatePrototype.cpp \
ErrorConstructor.cpp \
Error.cpp \
ErrorInstance.cpp \
ErrorPrototype.cpp \
ExceptionHelpers.cpp \
Executable.cpp \
FunctionConstructor.cpp \
FunctionPrototype.cpp \
GetterSetter.cpp \
GlobalEvalFunction.cpp \
Identifier.cpp \
InitializeThreading.cpp \
InternalFunction.cpp \
JSActivation.cpp \
JSAPIValueWrapper.cpp \
JSArray.cpp \
JSByteArray.cpp \
JSCell.cpp \
JSFunction.cpp \
JSGlobalData.cpp \
JSGlobalObject.cpp \
JSGlobalObjectFunctions.cpp \
JSImmediate.cpp \
JSLock.cpp \
JSNotAnObject.cpp \
JSNumberCell.cpp \
JSObject.cpp \
JSONObject.cpp \
JSPropertyNameIterator.cpp \
JSStaticScopeObject.cpp \
JSString.cpp \
JSValue.cpp \
JSVariableObject.cpp \
JSWrapperObject.cpp \
LiteralParser.cpp \
Lookup.cpp \
MarkStackPosix.cpp \
MarkStackSymbian.cpp \
MarkStackWin.cpp \
MarkStack.cpp \
MathObject.cpp \
NativeErrorConstructor.cpp \
NativeErrorPrototype.cpp \
NumberConstructor.cpp \
NumberObject.cpp \
NumberPrototype.cpp \
ObjectConstructor.cpp \
ObjectPrototype.cpp \
Operations.cpp \
PropertyDescriptor.cpp \
PropertyNameArray.cpp \
PropertySlot.cpp \
PrototypeFunction.cpp \
RegExpConstructor.cpp \
RegExp.cpp \
RegExpObject.cpp \
RegExpPrototype.cpp \
ScopeChain.cpp \
SmallStrings.cpp \
StringConstructor.cpp \
StringObject.cpp \
StringPrototype.cpp \
StructureChain.cpp \
Structure.cpp \
TimeoutChecker.cpp \
UString.cpp \
UStringImpl.cpp \
Assertions.cpp \
ByteArray.cpp \
CurrentTime.cpp \
DateMath.cpp \
dtoa.cpp \
FastMalloc.cpp \
HashTable.cpp \
MainThread.cpp \
MainThreadQt.cpp \
ThreadingQt.cpp \
RandomNumber.cpp \
RefCountedLeakCounter.cpp \
RegisterFileAllocatorSymbian.cpp \
BlockAllocatorSymbian.cpp \
ThreadingNone.cpp \
Threading.cpp \
TypeTraits.cpp \
CollatorDefault.cpp \
CollatorICU.cpp \
UTF8.cpp \
RegexCompiler.cpp \
RegexInterpreter.cpp \
RegexJIT.cpp \
Grammar.cpp \
TCSystemAlloc.cpp
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
# source files generated from existing header files ('moc_%.cpp: %.h' rule in spec-qt4.mk)
# extracted from 'compiler_moc_header_make_all' target
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk)
# extracted from 'compiler_moc_source_make_all' rule
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
MainThreadQt.moc \
ThreadingQt.moc

View File

@ -8,129 +8,20 @@ QT_DEFINES += -DQT_BUILD_NETWORK_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASC
# use default warning level to avoid noise when compiling contrib code
CC_WARN =
# extracted from src/script/Makefile
QT_SOURCES = \
qftp.cpp \
qhttp.cpp \
qhttpnetworkheader.cpp \
qhttpnetworkrequest.cpp \
qhttpnetworkreply.cpp \
qhttpnetworkconnection.cpp \
qhttpnetworkconnectionchannel.cpp \
qfilenetworkreply.cpp \
qnetworkaccessmanager.cpp \
qnetworkaccesscache.cpp \
qnetworkaccessbackend.cpp \
qnetworkaccessdatabackend.cpp \
qnetworkaccessdebugpipebackend.cpp \
qnetworkaccessfilebackend.cpp \
qnetworkaccesscachebackend.cpp \
qnetworkaccessftpbackend.cpp \
qnetworkaccesshttpbackend.cpp \
qnetworkcookie.cpp \
qnetworkcookiejar.cpp \
qnetworkrequest.cpp \
qnetworkreply.cpp \
qnetworkreplyimpl.cpp \
qabstractnetworkcache.cpp \
qnetworkdiskcache.cpp \
qnetworksession.cpp \
qnetworkconfigmanager.cpp \
qnetworkconfiguration.cpp \
qnetworkconfigmanager_p.cpp \
qbearerengine.cpp \
qbearerplugin.cpp \
qauthenticator.cpp \
qhostaddress.cpp \
qhostinfo.cpp \
qurlinfo.cpp \
qnetworkproxy.cpp \
qnetworkinterface.cpp \
qhostinfo_unix.cpp \
qnetworkinterface_unix.cpp \
qnetworkproxy_generic.cpp \
qabstractsocketengine.cpp \
qnativesocketengine.cpp \
qhttpsocketengine.cpp \
qsocks5socketengine.cpp \
qabstractsocket.cpp \
qtcpsocket.cpp \
qudpsocket.cpp \
qtcpserver.cpp \
qlocalsocket.cpp \
qlocalserver.cpp \
qnativesocketengine_unix.cpp \
qlocalsocket_unix.cpp \
qlocalserver_unix.cpp \
moc_qhttpnetworkreply_p.cpp \
moc_qnetworkaccesscache_p.cpp \
moc_qnetworkaccessbackend_p.cpp \
moc_qnetworkaccesshttpbackend_p.cpp \
moc_qnetworkaccessfilebackend_p.cpp \
moc_qnetworkcookiejar.cpp \
moc_qnetworkreply.cpp \
moc_qabstractnetworkcache.cpp \
moc_qnetworkdiskcache.cpp \
moc_qnetworkconfigmanager_p.cpp \
moc_qnetworksession_p.cpp \
moc_qbearerplugin_p.cpp \
moc_qhostinfo_p.cpp \
moc_qabstractsocketengine_p.cpp \
moc_qnativesocketengine_p.cpp \
moc_qhttpsocketengine_p.cpp \
moc_qsocks5socketengine_p.cpp \
moc_qtcpsocket.cpp
include $(REP_DIR)/lib/mk/qt_network_generated.inc
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
# remove unneeded files to prevent moc warnings
COMPILER_MOC_HEADER_MAKE_ALL_FILES_FILTER_OUT = \
moc_qftp.cpp \
moc_qnetworkaccessdebugpipebackend_p.cpp \
moc_qnetworkaccessftpbackend_p.cpp \
moc_qudpsocket.cpp
# source files generated from existing header files ("moc_%.cpp: %.h" rule in spec-qt4.mk)
# extracted from "compiler_moc_header_make_all" target
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qhttp.cpp \
moc_qhttpnetworkreply_p.cpp \
moc_qhttpnetworkconnection_p.cpp \
moc_qhttpnetworkconnectionchannel_p.cpp \
moc_qfilenetworkreply_p.cpp \
moc_qnetworkaccessmanager.cpp \
moc_qnetworkaccesscache_p.cpp \
moc_qnetworkaccessbackend_p.cpp \
moc_qnetworkaccesshttpbackend_p.cpp \
moc_qnetworkaccessfilebackend_p.cpp \
moc_qnetworkcookiejar.cpp \
moc_qnetworkreply.cpp \
moc_qnetworkreplyimpl_p.cpp \
moc_qabstractnetworkcache.cpp \
moc_qnetworkdiskcache.cpp \
moc_qnetworksession.cpp \
moc_qnetworkconfigmanager.cpp \
moc_qnetworkconfigmanager_p.cpp \
moc_qnetworksession_p.cpp \
moc_qbearerengine_p.cpp \
moc_qbearerplugin_p.cpp \
moc_qhostinfo_p.cpp \
moc_qabstractsocketengine_p.cpp \
moc_qnativesocketengine_p.cpp \
moc_qhttpsocketengine_p.cpp \
moc_qsocks5socketengine_p.cpp \
moc_qabstractsocket.cpp \
moc_qtcpsocket.cpp \
moc_qtcpserver.cpp \
moc_qlocalserver.cpp \
moc_qlocalsocket.cpp
COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILTER_OUT = \
qftp.moc
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
$(REP_DIR)/include/qt4 \
$(REP_DIR)/contrib/$(QT4)/include \
$(REP_DIR)/include/qt4/QtCore \
$(REP_DIR)/contrib/$(QT4)/include/QtCore \
$(REP_DIR)/include/qt4/QtCore/private \
$(REP_DIR)/contrib/$(QT4)/include/QtCore/private \
$(REP_DIR)/include/qt4/QtNetwork \
$(REP_DIR)/contrib/$(QT4)/include/QtNetwork \
$(REP_DIR)/include/qt4/QtNetwork/private \
$(REP_DIR)/contrib/$(QT4)/include/QtNetwork/private \
$(REP_DIR)/src/lib/qt4/src/corelib/global
INC_DIR += $(REP_DIR)/include/qt4/QtNetwork/private \
$(REP_DIR)/contrib/$(QT4)/include/QtNetwork/private
LIBS += qt_core zlib libc
@ -147,4 +38,4 @@ vpath % $(REP_DIR)/contrib/$(QT4)/src/network/bearer
vpath % $(REP_DIR)/contrib/$(QT4)/src/network/kernel
vpath % $(REP_DIR)/contrib/$(QT4)/src/network/socket
include $(REP_DIR)/lib/mk/qt.mk
include $(REP_DIR)/lib/mk/qt.inc

View File

@ -0,0 +1,125 @@
QT_SOURCES = \
qftp.cpp \
qhttp.cpp \
qhttpnetworkheader.cpp \
qhttpnetworkrequest.cpp \
qhttpnetworkreply.cpp \
qhttpnetworkconnection.cpp \
qhttpnetworkconnectionchannel.cpp \
qfilenetworkreply.cpp \
qnetworkaccessmanager.cpp \
qnetworkaccesscache.cpp \
qnetworkaccessbackend.cpp \
qnetworkaccessdatabackend.cpp \
qnetworkaccessdebugpipebackend.cpp \
qnetworkaccessfilebackend.cpp \
qnetworkaccesscachebackend.cpp \
qnetworkaccessftpbackend.cpp \
qnetworkaccesshttpbackend.cpp \
qnetworkcookie.cpp \
qnetworkcookiejar.cpp \
qnetworkrequest.cpp \
qnetworkreply.cpp \
qnetworkreplyimpl.cpp \
qabstractnetworkcache.cpp \
qnetworkdiskcache.cpp \
qnetworksession.cpp \
qnetworkconfigmanager.cpp \
qnetworkconfiguration.cpp \
qnetworkconfigmanager_p.cpp \
qbearerengine.cpp \
qbearerplugin.cpp \
qsharednetworksession.cpp \
qauthenticator.cpp \
qhostaddress.cpp \
qhostinfo.cpp \
qurlinfo.cpp \
qnetworkproxy.cpp \
qnetworkinterface.cpp \
qhostinfo_unix.cpp \
qnetworkinterface_unix.cpp \
qnetworkproxy_generic.cpp \
qabstractsocketengine.cpp \
qnativesocketengine.cpp \
qhttpsocketengine.cpp \
qsocks5socketengine.cpp \
qabstractsocket.cpp \
qtcpsocket.cpp \
qudpsocket.cpp \
qtcpserver.cpp \
qlocalsocket.cpp \
qlocalserver.cpp \
qnativesocketengine_unix.cpp \
qlocalsocket_unix.cpp \
qlocalserver_unix.cpp \
moc_qhttpnetworkreply_p.cpp \
moc_qnetworkaccesscache_p.cpp \
moc_qnetworkaccessbackend_p.cpp \
moc_qnetworkaccessdebugpipebackend_p.cpp \
moc_qnetworkaccesshttpbackend_p.cpp \
moc_qnetworkaccessfilebackend_p.cpp \
moc_qnetworkaccessftpbackend_p.cpp \
moc_qnetworkcookiejar.cpp \
moc_qnetworkreply.cpp \
moc_qabstractnetworkcache.cpp \
moc_qnetworkdiskcache.cpp \
moc_qnetworkconfigmanager_p.cpp \
moc_qnetworksession_p.cpp \
moc_qbearerplugin_p.cpp \
moc_qhostinfo_p.cpp \
moc_qabstractsocketengine_p.cpp \
moc_qnativesocketengine_p.cpp \
moc_qhttpsocketengine_p.cpp \
moc_qsocks5socketengine_p.cpp \
moc_qtcpsocket.cpp \
moc_qudpsocket.cpp
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
# source files generated from existing header files ('moc_%.cpp: %.h' rule in spec-qt4.mk)
# extracted from 'compiler_moc_header_make_all' target
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qftp.cpp \
moc_qhttp.cpp \
moc_qhttpnetworkreply_p.cpp \
moc_qhttpnetworkconnection_p.cpp \
moc_qhttpnetworkconnectionchannel_p.cpp \
moc_qfilenetworkreply_p.cpp \
moc_qnetworkaccessmanager.cpp \
moc_qnetworkaccesscache_p.cpp \
moc_qnetworkaccessbackend_p.cpp \
moc_qnetworkaccessdebugpipebackend_p.cpp \
moc_qnetworkaccesshttpbackend_p.cpp \
moc_qnetworkaccessfilebackend_p.cpp \
moc_qnetworkaccessftpbackend_p.cpp \
moc_qnetworkcookiejar.cpp \
moc_qnetworkreply.cpp \
moc_qnetworkreplyimpl_p.cpp \
moc_qabstractnetworkcache.cpp \
moc_qnetworkdiskcache.cpp \
moc_qnetworksession.cpp \
moc_qnetworkconfigmanager.cpp \
moc_qnetworkconfigmanager_p.cpp \
moc_qnetworksession_p.cpp \
moc_qbearerengine_p.cpp \
moc_qbearerplugin_p.cpp \
moc_qhostinfo_p.cpp \
moc_qabstractsocketengine_p.cpp \
moc_qnativesocketengine_p.cpp \
moc_qhttpsocketengine_p.cpp \
moc_qsocks5socketengine_p.cpp \
moc_qabstractsocket.cpp \
moc_qtcpsocket.cpp \
moc_qudpsocket.cpp \
moc_qtcpserver.cpp \
moc_qlocalserver.cpp \
moc_qlocalsocket.cpp
# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk)
# extracted from 'compiler_moc_source_make_all' rule
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
qftp.moc

View File

@ -343,4 +343,4 @@ vpath % $(REP_DIR)/contrib/$(QT4)/src/script/bridge
vpath % $(REP_DIR)/contrib/$(QT4)/src/script/parser
vpath % $(REP_DIR)/contrib/$(QT4)/src/script/utils
include $(REP_DIR)/lib/mk/qt.mk
include $(REP_DIR)/lib/mk/qt.inc

View File

@ -8,65 +8,7 @@ QT_DEFINES += -DQT_BUILD_SCRIPT_LIB -DQT_NO_USING_NAMESPACE -DQLALR_NO_QSCRIPTGR
# use default warning level to avoid noise when compiling contrib code
CC_WARN =
# extracted from src/script/Makefile
QT_SOURCES = \
qscriptasm.cpp \
qscriptast.cpp \
qscriptastvisitor.cpp \
qscriptcompiler.cpp \
qscriptecmaarray.cpp \
qscriptecmaboolean.cpp \
qscriptecmacore.cpp \
qscriptecmadate.cpp \
qscriptecmafunction.cpp \
qscriptecmaglobal.cpp \
qscriptecmamath.cpp \
qscriptecmanumber.cpp \
qscriptecmaobject.cpp \
qscriptecmaregexp.cpp \
qscriptecmastring.cpp \
qscriptecmaerror.cpp \
qscriptcontext_p.cpp \
qscriptengine.cpp \
qscriptengine_p.cpp \
qscriptengineagent.cpp \
qscriptextenumeration.cpp \
qscriptextvariant.cpp \
qscriptcontext.cpp \
qscriptcontextinfo.cpp \
qscriptfunction.cpp \
qscriptgrammar.cpp \
qscriptlexer.cpp \
qscriptclassdata.cpp \
qscriptparser.cpp \
qscriptprettypretty.cpp \
qscriptxmlgenerator.cpp \
qscriptsyntaxchecker.cpp \
qscriptstring.cpp \
qscriptclass.cpp \
qscriptclasspropertyiterator.cpp \
qscriptvalueiteratorimpl.cpp \
qscriptvalueiterator.cpp \
qscriptvalueimpl.cpp \
qscriptvalue.cpp \
qscriptextqobject.cpp \
qscriptable.cpp \
qscriptextensionplugin.cpp \
moc_qscriptextensionplugin.cpp
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
# source files generated from existing header files ("moc_%.cpp: %.h" rule in spec-qt4.mk)
# extracted from "compiler_moc_header_make_all" target
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qscriptengine.cpp \
moc_qscriptextensionplugin.cpp
# source files generated from existing source files ("%.moc: %.cpp" rule in spec-qt4.mk)
# extracted from "compiler_moc_source_make_all" rule
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
qscriptextqobject.moc
include $(REP_DIR)/lib/mk/qt_scriptclassic_generated.inc
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
$(REP_DIR)/include/qt4 \
@ -89,4 +31,4 @@ vpath % $(REP_DIR)/src/lib/qt4/src/script
vpath % $(REP_DIR)/contrib/qtscriptclassic-1.0_1-opensource/src
include $(REP_DIR)/lib/mk/qt.mk
include $(REP_DIR)/lib/mk/qt.inc

View File

@ -0,0 +1,60 @@
QT_SOURCES = \
qscriptasm.cpp \
qscriptast.cpp \
qscriptastvisitor.cpp \
qscriptcompiler.cpp \
qscriptecmaarray.cpp \
qscriptecmaboolean.cpp \
qscriptecmacore.cpp \
qscriptecmadate.cpp \
qscriptecmafunction.cpp \
qscriptecmaglobal.cpp \
qscriptecmamath.cpp \
qscriptecmanumber.cpp \
qscriptecmaobject.cpp \
qscriptecmaregexp.cpp \
qscriptecmastring.cpp \
qscriptecmaerror.cpp \
qscriptcontext_p.cpp \
qscriptengine.cpp \
qscriptengine_p.cpp \
qscriptengineagent.cpp \
qscriptextenumeration.cpp \
qscriptextvariant.cpp \
qscriptcontext.cpp \
qscriptcontextinfo.cpp \
qscriptfunction.cpp \
qscriptgrammar.cpp \
qscriptlexer.cpp \
qscriptclassdata.cpp \
qscriptparser.cpp \
qscriptprettypretty.cpp \
qscriptxmlgenerator.cpp \
qscriptsyntaxchecker.cpp \
qscriptstring.cpp \
qscriptclass.cpp \
qscriptclasspropertyiterator.cpp \
qscriptvalueiteratorimpl.cpp \
qscriptvalueiterator.cpp \
qscriptvalueimpl.cpp \
qscriptvalue.cpp \
qscriptextqobject.cpp \
qscriptable.cpp \
qscriptextensionplugin.cpp \
moc_qscriptextensionplugin.cpp
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
# source files generated from existing header files ('moc_%.cpp: %.h' rule in spec-qt4.mk)
# extracted from 'compiler_moc_header_make_all' target
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qscriptengine.cpp \
moc_qscriptextensionplugin.cpp
# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk)
# extracted from 'compiler_moc_source_make_all' rule
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
qscriptextqobject.moc

View File

@ -146,4 +146,4 @@ vpath % $(REP_DIR)/include/qt4/QtScriptTools/private
vpath % $(REP_DIR)/src/lib/qt4/src/scripttools/debugging
vpath % $(REP_DIR)/contrib/$(QT4)/src/scripttools/debugging
include $(REP_DIR)/lib/mk/qt.mk
include $(REP_DIR)/lib/mk/qt.inc

View File

@ -5,52 +5,10 @@ SHARED_LIB = yes
# extracted from src/svg/Makefile
QT_DEFINES += -DQT_BUILD_SVG_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
# extracted from src/svg/Makefile
include $(REP_DIR)/lib/mk/qt_svg_generated.inc
QT_SOURCES = \
qsvggraphics.cpp \
qsvghandler.cpp \
qsvgnode.cpp \
qsvgstructure.cpp \
qsvgstyle.cpp \
qsvgfont.cpp \
qsvgtinydocument.cpp \
qsvgrenderer.cpp \
qsvgwidget.cpp \
qgraphicssvgitem.cpp \
qsvggenerator.cpp \
moc_qsvgwidget.cpp
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
# source files generated from header files ("moc_%.cpp: %.h" rule in spec-qt4.mk)
# extracted from "compiler_moc_header_make_all" target
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qsvgrenderer.cpp \
moc_qsvgwidget.cpp \
moc_qgraphicssvgitem.cpp
# source files generated from source files ("%.moc: %.cpp" rule in spec-qt4.mk)
# extracted from "compiler_moc_source_make_all" target
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
$(REP_DIR)/include/qt4 \
$(REP_DIR)/contrib/$(QT4)/include \
$(REP_DIR)/include/qt4/QtCore \
$(REP_DIR)/contrib/$(QT4)/include/QtCore \
$(REP_DIR)/include/qt4/QtCore/private \
$(REP_DIR)/contrib/$(QT4)/include/QtCore/private \
$(REP_DIR)/include/qt4/QtGui \
$(REP_DIR)/contrib/$(QT4)/include/QtGui \
$(REP_DIR)/include/qt4/QtGui/private \
$(REP_DIR)/contrib/$(QT4)/include/QtGui/private \
$(REP_DIR)/include/qt4/QtSvg \
$(REP_DIR)/contrib/$(QT4)/include/QtSvg \
$(REP_DIR)/include/qt4/QtSvg/private \
INC_DIR += $(REP_DIR)/include/qt4/QtSvg/private \
$(REP_DIR)/contrib/$(QT4)/include/QtSvg/private \
$(REP_DIR)/src/lib/qt4/src/corelib/global \
$(REP_DIR)/contrib/$(QT4)/src/3rdparty/harfbuzz/src
LIBS += qt_core qt_gui zlib libc
@ -62,4 +20,4 @@ vpath % $(REP_DIR)/src/lib/qt4/src/svg
vpath % $(REP_DIR)/contrib/$(QT4)/src/svg
include $(REP_DIR)/lib/mk/qt.mk
include $(REP_DIR)/lib/mk/qt.inc

View File

@ -0,0 +1,31 @@
QT_SOURCES = \
qsvggraphics.cpp \
qsvghandler.cpp \
qsvgnode.cpp \
qsvgstructure.cpp \
qsvgstyle.cpp \
qsvgfont.cpp \
qsvgtinydocument.cpp \
qsvgrenderer.cpp \
qsvgwidget.cpp \
qgraphicssvgitem.cpp \
qsvggenerator.cpp \
moc_qsvgwidget.cpp
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
# source files generated from existing header files ('moc_%.cpp: %.h' rule in spec-qt4.mk)
# extracted from 'compiler_moc_header_make_all' target
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_qsvgrenderer.cpp \
moc_qsvgwidget.cpp \
moc_qgraphicssvgitem.cpp
# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk)
# extracted from 'compiler_moc_source_make_all' rule
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \

View File

@ -7,48 +7,12 @@ QT_DEFINES += -DQFORMINTERNAL_NAMESPACE -DQT_DESIGNER_STATIC -DQT_FORMBUILDER_NO
CC_OPT += -Wno-unused-but-set-variable
# extracted from src/script/Makefile
QT_SOURCES = \
abstractformbuilder.cpp \
formbuilder.cpp \
ui4.cpp \
properties.cpp \
formbuilderextra.cpp \
resourcebuilder.cpp \
textbuilder.cpp \
quiloader.cpp \
moc_properties_p.cpp \
moc_quiloader.cpp
include $(REP_DIR)/lib/mk/qt_ui_tools_generated.inc
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
# source files generated from existing header files ("moc_%.cpp: %.h" rule in spec-qt4.mk)
# extracted from "compiler_moc_header_make_all" target
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_properties_p.cpp \
moc_quiloader.cpp
# source files generated from existing source files ("%.moc: %.cpp" rule in spec-qt4.mk)
# extracted from "compiler_moc_source_make_all" rule
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
quiloader.moc
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
$(REP_DIR)/include/qt4 \
$(REP_DIR)/contrib/$(QT4)/include \
$(REP_DIR)/include/qt4/QtCore \
$(REP_DIR)/contrib/$(QT4)/include/QtCore \
$(REP_DIR)/include/qt4/QtCore/private \
$(REP_DIR)/contrib/$(QT4)/include/QtCore/private \
$(REP_DIR)/include/qt4/QtXml \
$(REP_DIR)/contrib/$(QT4)/include/QtXml \
$(REP_DIR)/include/qt4/QtXml/private \
$(REP_DIR)/contrib/$(QT4)/include/QtXml/private \
$(REP_DIR)/src/lib/qt4/tools/designer/src/lib/uilib \
INC_DIR += $(REP_DIR)/src/lib/qt4/tools/designer/src/lib/uilib \
$(REP_DIR)/contrib/$(QT4)/tools/designer/src/lib/uilib \
$(REP_DIR)/contrib/$(QT4)/tools/designer/src/uitools \
$(REP_DIR)/src/lib/qt4/src/corelib/global
$(REP_DIR)/src/lib/qt4/tools/designer/src/uitools \
$(REP_DIR)/contrib/$(QT4)/tools/designer/src/uitools
LIBS += qt_core qt_gui qt_xml libc
@ -61,4 +25,4 @@ vpath % $(REP_DIR)/src/lib/qt4/tools/designer/src/uitools
vpath % $(REP_DIR)/contrib/$(QT4)/tools/designer/src/lib/uilib
vpath % $(REP_DIR)/contrib/$(QT4)/tools/designer/src/uitools
include $(REP_DIR)/lib/mk/qt.mk
include $(REP_DIR)/lib/mk/qt.inc

View File

@ -0,0 +1,28 @@
QT_SOURCES = \
abstractformbuilder.cpp \
formbuilder.cpp \
ui4.cpp \
properties.cpp \
formbuilderextra.cpp \
resourcebuilder.cpp \
textbuilder.cpp \
quiloader.cpp \
moc_properties_p.cpp \
moc_quiloader.cpp
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
# source files generated from existing header files ('moc_%.cpp: %.h' rule in spec-qt4.mk)
# extracted from 'compiler_moc_header_make_all' target
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
moc_properties_p.cpp \
moc_quiloader.cpp
# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk)
# extracted from 'compiler_moc_source_make_all' rule
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
quiloader.moc

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -5,34 +5,10 @@ SHARED_LIB = yes
# extracted from src/xml/Makefile
QT_DEFINES += -DQT_BUILD_XML_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_NO_DEBUG -DQT_CORE_LIB
# extracted from src/xml/Makefile
QT_SOURCES = \
qdom.cpp \
qxml.cpp
include $(REP_DIR)/lib/mk/qt_xml_generated.inc
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
# source files generated from existing header files ("moc_%.cpp: %.h" rule in spec-qt4.mk)
# extracted from "compiler_moc_header_make_all" target
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
# source files generated from existing source files ("%.moc: %.cpp" rule in spec-qt4.mk)
# extracted from "compiler_moc_source_make_all" rule
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
$(REP_DIR)/include/qt4 \
$(REP_DIR)/contrib/$(QT4)/include \
$(REP_DIR)/include/qt4/QtCore \
$(REP_DIR)/contrib/$(QT4)/include/QtCore \
$(REP_DIR)/include/qt4/QtCore/private \
$(REP_DIR)/contrib/$(QT4)/include/QtCore/private \
$(REP_DIR)/include/qt4/QtXml \
$(REP_DIR)/contrib/$(QT4)/include/QtXml \
$(REP_DIR)/include/qt4/QtXml/private \
INC_DIR += $(REP_DIR)/include/qt4/QtXml/private \
$(REP_DIR)/contrib/$(QT4)/include/QtXml/private \
$(REP_DIR)/src/lib/qt4/src/corelib/global
LIBS += qt_core libc
@ -45,4 +21,4 @@ vpath % $(REP_DIR)/src/lib/qt4/src/xml/sax
vpath % $(REP_DIR)/contrib/$(QT4)/src/xml/dom
vpath % $(REP_DIR)/contrib/$(QT4)/src/xml/sax
include $(REP_DIR)/lib/mk/qt.mk
include $(REP_DIR)/lib/mk/qt.inc

View File

@ -0,0 +1,19 @@
QT_SOURCES = \
qdom.cpp \
qxml.cpp
# some source files need to be generated by moc from other source/header files before
# they get #included again by the original source file in the compiling stage
# source files generated from existing header files ('moc_%.cpp: %.h' rule in spec-qt4.mk)
# extracted from 'compiler_moc_header_make_all' target
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
# source files generated from existing source files ('%.moc: %.cpp' rule in spec-qt4.mk)
# extracted from 'compiler_moc_source_make_all' rule
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \

View File

@ -109,6 +109,7 @@ set boot_modules {
libc_lock_pipe.lib.so
libm.lib.so
libpng.lib.so
jpeg.lib.so
qt_core.lib.so
qt_gui.lib.so
qt_script.lib.so

View File

@ -1,6 +1,6 @@
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource prefix="/qt/fonts">
<file alias="helvetica_120_50.qpf">../../../../contrib/qt-everywhere-opensource-src-4.7.1/lib/fonts/helvetica_120_50.qpf</file>
<file alias="helvetica_120_50.qpf">../../../../contrib/qt-everywhere-opensource-src-4.7.4/lib/fonts/helvetica_120_50.qpf</file>
</qresource>
</RCC>

View File

@ -12,8 +12,10 @@ INC_DIR += $(PRG_DIR)
# include the qmake project file
# -> change the filename if it differs from the project dir name
QT4 = qt-everywhere-opensource-src-4.7.4
#QMAKE_PROJECT_FILE = $(realpath $(PRG_DIR)/$(PROJECT_DIR_NAME).pro)
QMAKE_PROJECT_FILE = $(realpath $(REP_DIR)/contrib/qt-everywhere-opensource-src-4.7.1/examples/webkit/previewer/previewer.pro)
QMAKE_PROJECT_FILE = $(realpath $(REP_DIR)/contrib/$(QT4)/examples/webkit/previewer/previewer.pro)
ifneq ($(strip $(QMAKE_PROJECT_FILE)),)
include $(QMAKE_PROJECT_FILE)
@ -38,7 +40,7 @@ endif
CC_CXX_OPT += -DQT_MAIN_STACK_SIZE=512*1024
vpath % $(REP_DIR)/contrib/qt-everywhere-opensource-src-4.7.1/examples/webkit/previewer
vpath % $(REP_DIR)/contrib/$(QT4)/examples/webkit/previewer
###### end of editable part ######

View File

@ -1,6 +1,6 @@
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource prefix="/qt/fonts">
<file alias="helvetica_120_50.qpf">../../../../contrib/qt-everywhere-opensource-src-4.7.1/lib/fonts/helvetica_120_50.qpf</file>
<file alias="helvetica_120_50.qpf">../../../../contrib/qt-everywhere-opensource-src-4.7.4/lib/fonts/helvetica_120_50.qpf</file>
</qresource>
</RCC>

View File

@ -12,8 +12,10 @@ INC_DIR += $(PRG_DIR)
# include the qmake project file
# -> change the filename if it differs from the project dir name
QT4 = qt-everywhere-opensource-src-4.7.4
#QMAKE_PROJECT_FILE = $(realpath $(PRG_DIR)/$(PROJECT_DIR_NAME).pro)
QMAKE_PROJECT_FILE = $(realpath $(REP_DIR)/contrib/qt-everywhere-opensource-src-4.7.1/demos/textedit/textedit.pro)
QMAKE_PROJECT_FILE = $(realpath $(REP_DIR)/contrib/$(QT4)/demos/textedit/textedit.pro)
ifneq ($(strip $(QMAKE_PROJECT_FILE)),)
include $(QMAKE_PROJECT_FILE)
@ -37,7 +39,7 @@ endif
CC_CXX_OPT += -DQT_MAIN_STACK_SIZE=512*1024
vpath % $(REP_DIR)/contrib/qt-everywhere-opensource-src-4.7.1/demos/textedit
vpath % $(REP_DIR)/contrib/$(QT4)/demos/textedit
###### end of editable part ######

View File

@ -1,6 +1,6 @@
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource prefix="/qt/fonts">
<file alias="helvetica_120_50.qpf">../../../contrib/qt-everywhere-opensource-src-4.7.1/lib/fonts/helvetica_120_50.qpf</file>
<file alias="helvetica_120_50.qpf">../../../contrib/qt-everywhere-opensource-src-4.7.4/lib/fonts/helvetica_120_50.qpf</file>
</qresource>
</RCC>

View File

@ -1,6 +1,6 @@
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource prefix="/qt/fonts">
<file alias="DejaVuSans.ttf">../../../contrib/qt-everywhere-opensource-src-4.7.1/lib/fonts/DejaVuSans.ttf</file>
<file alias="DejaVuSans.ttf">../../../contrib/qt-everywhere-opensource-src-4.7.4/lib/fonts/DejaVuSans.ttf</file>
</qresource>
</RCC>

View File

@ -82,7 +82,7 @@
#endif
#define QT_USE_XOPEN_LFS_EXTENSIONS
#include "../../../../../contrib/qt-everywhere-opensource-src-4.7.1/mkspecs/common/posix/qplatformdefs.h"
#include "../../../../../contrib/qt-everywhere-opensource-src-4.7.4/mkspecs/common/posix/qplatformdefs.h"
#undef QT_SOCKLEN_T

View File

@ -7,7 +7,7 @@ diff --git a/include/QtCore/qconfig.h b/include/QtCore/qconfig.h
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
@@ -67,6 +67,13 @@
@@ -62,6 +62,13 @@
#include <OS.h>
@ -21,7 +21,7 @@ diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/
#elif OS(UNIX)
#include <stdlib.h>
@@ -235,6 +242,15 @@
@@ -207,6 +214,15 @@
void* address = _aligned_malloc(BLOCK_SIZE, BLOCK_SIZE);
#endif
memset(address, 0, BLOCK_SIZE);
@ -37,7 +37,7 @@ diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/
#elif HAVE(POSIX_MEMALIGN)
void* address;
posix_memalign(&address, BLOCK_SIZE, BLOCK_SIZE);
@@ -325,6 +341,9 @@
@@ -297,6 +313,9 @@
#else
_aligned_free(block);
#endif
@ -47,7 +47,7 @@ diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/
#elif HAVE(POSIX_MEMALIGN)
free(block);
#else
@@ -666,6 +685,8 @@
@@ -638,6 +657,8 @@
thread_info threadInfo;
get_thread_info(find_thread(NULL), &threadInfo);
return threadInfo.stack_end;
@ -333,7 +333,7 @@ diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.c
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -90,6 +90,10 @@
@@ -89,6 +89,10 @@
_LIT(qt_symbianSystemInstallDir, "z:\\system\\install\\");
#endif
@ -344,7 +344,7 @@ diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
QT_BEGIN_NAMESPACE
@@ -2244,6 +2248,8 @@
@@ -2253,6 +2257,8 @@
RDebug::Print(format, hbuffer);
}
delete hbuffer;
@ -546,7 +546,7 @@ diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -75,7 +75,11 @@
@@ -76,7 +76,11 @@
# if !defined(QT_NO_GLIB)
# include "qeventdispatcher_glib_p.h"
# endif
@ -558,7 +558,7 @@ diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcorea
#endif
#ifdef Q_OS_WIN
@@ -318,7 +322,11 @@
@@ -374,7 +378,11 @@
eventDispatcher = new QEventDispatcherGlib(q);
else
# endif
@ -570,7 +570,7 @@ diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcorea
#elif defined(Q_OS_WIN)
eventDispatcher = new QEventDispatcherWin32(q);
#else
@@ -532,7 +540,7 @@
@@ -587,7 +595,7 @@
{
Q_D(QCoreApplication);
@ -921,7 +921,7 @@ diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -3085,6 +3085,9 @@
@@ -3086,6 +3086,9 @@
// posix compliant system
struct timeval tv;
gettimeofday(&tv, 0);
@ -931,7 +931,7 @@ diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
time_t ltime = tv.tv_sec;
struct tm *t = 0;
@@ -3099,6 +3102,7 @@
@@ -3100,6 +3103,7 @@
Q_CHECK_PTR(t);
ct.mds = msecsFromDecomposed(t->tm_hour, t->tm_min, t->tm_sec, tv.tv_usec / 1000);
@ -939,7 +939,7 @@ diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
return ct;
}
@@ -3983,6 +3987,10 @@
@@ -3984,6 +3988,10 @@
static QDateTimePrivate::Spec utcToLocal(QDate &date, QTime &time)
{
@ -950,7 +950,7 @@ diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
QDate fakeDate = adjustDate(date);
// won't overflow because of fakeDate
@@ -4057,6 +4065,10 @@
@@ -4058,6 +4066,10 @@
static void localToUtc(QDate &date, QTime &time, int isdst)
{
@ -1022,7 +1022,7 @@ diff --git a/src/gui/embedded/qwindowsystem_qws.cpp b/src/gui/embedded/qwindowsy
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -130,7 +130,7 @@
@@ -174,7 +174,7 @@
}
}
@ -1031,7 +1031,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
static
void CALLBACK_CALL_TYPE qpiw_write_fn(png_structp png_ptr, png_bytep data, png_size_t length)
{
@@ -149,6 +149,7 @@
@@ -193,6 +193,7 @@
void CALLBACK_CALL_TYPE qpiw_flush_fn(png_structp /* png_ptr */)
{
}
@ -1039,7 +1039,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
#if defined(Q_C_CALLBACKS)
}
@@ -157,12 +158,13 @@
@@ -201,12 +202,13 @@
static
void setup_qt(QImage& image, png_structp png_ptr, png_infop info_ptr, float screen_gamma=0.0)
{
@ -1054,7 +1054,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
png_uint_32 width;
png_uint_32 height;
int bit_depth;
@@ -372,13 +374,13 @@
@@ -384,13 +386,13 @@
png_ptr = 0;
return false;
}
@ -1067,10 +1067,10 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
}
-
+#endif
png_set_read_fn(png_ptr, q->device(), iod_read_fn);
png_set_read_fn(png_ptr, this, iod_read_fn);
png_read_info(png_ptr, info_ptr);
@@ -430,6 +432,7 @@
@@ -442,6 +444,7 @@
}
row_pointers = 0;
@ -1078,7 +1078,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
if (setjmp(png_jmpbuf(png_ptr))) {
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
delete [] row_pointers;
@@ -437,7 +440,7 @@
@@ -449,7 +452,7 @@
state = Error;
return false;
}
@ -1087,7 +1087,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
setup_qt(*outImage, png_ptr, info_ptr, gamma);
if (outImage->isNull()) {
@@ -468,9 +471,9 @@
@@ -480,9 +483,9 @@
png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
if (outImage->depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
QRgb trans = 0xFF000000 | qRgb(
@ -1100,7 +1100,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
for (uint y=0; y<height; y++) {
for (uint x=0; x<info_ptr->width; x++) {
if (((uint**)jt)[y][x] == trans) {
@@ -607,7 +610,7 @@
@@ -620,7 +623,7 @@
gamma = g;
}
@ -1109,7 +1109,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
#ifndef QT_NO_IMAGE_TEXT
static void set_text(const QImage &image, png_structp png_ptr, png_infop info_ptr,
const QString &description)
@@ -672,6 +675,7 @@
@@ -685,6 +688,7 @@
delete [] text_ptr;
}
#endif
@ -1117,8 +1117,8 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
bool QPNGImageWriter::writeImage(const QImage& image, int off_x, int off_y)
{
@@ -681,6 +685,8 @@
bool Q_INTERNAL_WIN_NO_THROW QPNGImageWriter::writeImage(const QImage& image_in, int quality_in, const QString &description,
@@ -694,6 +698,8 @@
bool Q_INTERNAL_WIN_NO_THROW QPNGImageWriter::writeImage(const QImage& image, int quality_in, const QString &description,
int off_x_in, int off_y_in)
{
+#ifdef PNG_WRITE_SUPPORTED
@ -1126,7 +1126,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
#ifdef QT_NO_IMAGE_TEXT
Q_UNUSED(description);
#endif
@@ -726,12 +732,12 @@
@@ -717,12 +723,12 @@
png_destroy_write_struct(&png_ptr, 0);
return false;
}
@ -1141,9 +1141,9 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
int quality = quality_in;
if (quality >= 0) {
if (quality > 9) {
@@ -751,9 +757,11 @@
: PNG_COLOR_TYPE_RGB_ALPHA
: PNG_COLOR_TYPE_PALETTE, 0, 0, 0); // also sets #channels
@@ -747,9 +753,11 @@
image.depth() == 1 ? 1 : 8, // per channel
color_type, 0, 0, 0); // sets #channels
+#if defined(PNG_gAMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
if (gamma != 0.0) {
@ -1153,7 +1153,7 @@ diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
png_color_8 sig_bit;
sig_bit.red = 8;
@@ -864,6 +872,9 @@
@@ -875,6 +883,9 @@
png_destroy_write_struct(&png_ptr, &info_ptr);
return true;
@ -1186,7 +1186,7 @@ diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -715,11 +715,23 @@
@@ -728,11 +728,23 @@
*/
QApplication::QApplication(int &argc, char **argv)
@ -1212,7 +1212,7 @@ diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
{ Q_D(QApplication); d->construct(); QApplicationPrivate::app_compile_version = _internal;}
@@ -749,11 +761,23 @@
@@ -762,11 +774,23 @@
*/
QApplication::QApplication(int &argc, char **argv, bool GUIenabled )
@ -1238,7 +1238,7 @@ diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
{ Q_D(QApplication); d->construct(); QApplicationPrivate::app_compile_version = _internal;}
@@ -883,7 +907,13 @@
@@ -896,7 +920,13 @@
This function is only available on X11.
*/
QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap)
@ -1253,7 +1253,7 @@ diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
{
if (! dpy)
qWarning("QApplication: Invalid Display* argument");
@@ -892,7 +922,13 @@
@@ -905,7 +935,13 @@
}
QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap, int _internal)
@ -1268,7 +1268,7 @@ diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
{
if (! dpy)
qWarning("QApplication: Invalid Display* argument");
@@ -917,7 +953,13 @@
@@ -930,7 +966,13 @@
*/
QApplication::QApplication(Display *dpy, int &argc, char **argv,
Qt::HANDLE visual, Qt::HANDLE colormap)
@ -1283,7 +1283,7 @@ diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
{
if (! dpy)
qWarning("QApplication: Invalid Display* argument");
@@ -927,7 +969,13 @@
@@ -940,7 +982,13 @@
QApplication::QApplication(Display *dpy, int &argc, char **argv,
Qt::HANDLE visual, Qt::HANDLE colormap, int _internal)

View File

@ -1,72 +0,0 @@
- don't do host lookups in separate threads to avoid inconsistent Qt socket states
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -54,6 +54,10 @@
# include <unistd.h>
#endif
+#ifdef Q_OS_GENODE
+#define QT_NO_THREAD 1
+#endif
+
QT_BEGIN_NAMESPACE
#ifndef QT_NO_THREAD
diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h
--- a/src/network/kernel/qhostinfo_p.h
+++ b/src/network/kernel/qhostinfo_p.h
@@ -61,6 +61,7 @@
#include "QtCore/qobject.h"
#include "QtCore/qpointer.h"
+#ifndef Q_OS_GENODE
#ifndef QT_NO_THREAD
#include "QtCore/qthread.h"
#include "QtCore/qthreadpool.h"
@@ -71,6 +72,7 @@
#include <QTime>
#include <QCache>
#endif
+#endif /* Q_OS_GENODE */
QT_BEGIN_NAMESPACE
@@ -112,6 +114,7 @@
int lookupId;
};
+#ifndef Q_OS_GENODE
#ifndef QT_NO_THREAD
// These functions are outside of the QHostInfo class and strictly internal.
// Do NOT use them outside of QAbstractSocket.
@@ -193,6 +196,7 @@
};
#endif
+#endif /* Q_OS_GENODE */
QT_END_NAMESPACE
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -1380,6 +1380,7 @@
#endif
} else {
if (d->threadData->eventDispatcher) {
+#ifndef Q_OS_GENODE
// this internal API for QHostInfo either immediately gives us the desired
// QHostInfo from cache or later calls the _q_startConnecting slot.
bool immediateResultValid = false;
@@ -1392,6 +1393,9 @@
d->hostLookupId = -1;
d->_q_startConnecting(hostInfo);
}
+#else
+ d->hostLookupId = QHostInfo::lookupHost(hostName, this, SLOT(_q_startConnecting(QHostInfo)));
+#endif
}
}

View File

@ -5,6 +5,8 @@
# \date 2009-05-15
#
QT4 = qt-everywhere-opensource-src-4.7.4
REP_DIR := $(realpath ..)
#
@ -20,7 +22,7 @@ ifneq ($(HOST_ARCH),x86_64)
HOST_ARCH=x86
endif
QMAKESPEC = $(REP_DIR)/contrib/qt-everywhere-opensource-src-4.7.1/mkspecs/qws/linux-$(HOST_ARCH)-g++
QMAKESPEC = $(REP_DIR)/contrib/$(QT4)/mkspecs/qws/linux-$(HOST_ARCH)-g++
#
# Build qmake
@ -31,10 +33,10 @@ qmake/qmake:
#
# Build the other tools using qmake
#
vpath bootstrap.pro $(REP_DIR)/contrib/qt-everywhere-opensource-src-4.7.1/src/tools/bootstrap
vpath moc.pro $(REP_DIR)/contrib/qt-everywhere-opensource-src-4.7.1/src/tools/moc
vpath rcc.pro $(REP_DIR)/contrib/qt-everywhere-opensource-src-4.7.1/src/tools/rcc
vpath uic.pro $(REP_DIR)/contrib/qt-everywhere-opensource-src-4.7.1/src/tools/uic
vpath bootstrap.pro $(REP_DIR)/contrib/$(QT4)/src/tools/bootstrap
vpath moc.pro $(REP_DIR)/contrib/$(QT4)/src/tools/moc
vpath rcc.pro $(REP_DIR)/contrib/$(QT4)/src/tools/rcc
vpath uic.pro $(REP_DIR)/contrib/$(QT4)/src/tools/uic
bootstrap/libbootstrap.a: bootstrap/Makefile
make -C bootstrap
@ -58,7 +60,7 @@ uic/uic: uic/Makefile bootstrap/libbootstrap.a
%/Makefile: %.pro
mkdir -p $*
QMAKESPEC=$(QMAKESPEC) qmake/qmake -o $*/Makefile \
QT_BUILD_TREE=$(REP_DIR)/contrib/qt-everywhere-opensource-src-4.7.1 \
QT_BUILD_TREE=$(REP_DIR)/contrib/$(QT4) \
INCLUDEPATH+=$(REP_DIR)/include/qt4 \
INCLUDEPATH+=$(REP_DIR)/include/qt4/QtCore \
INCLUDEPATH+=$(REP_DIR)/src/lib/qt4/src/corelib/global \

View File

@ -7,6 +7,8 @@
# This file is based on the generated Makefile created by qt4's configure.
#
QT4 = qt-everywhere-opensource-src-4.7.4
CC_1 = gcc
CC = $(CC_1)
CXX_1 = g++
@ -22,7 +24,7 @@ QMAKE_LFLAGS = $(QMAKE_LFLAGS_1)
REP_DIR := ../..
# root of Qt4 source tree
CONTRIB_DIR := $(REP_DIR)/contrib/qt-everywhere-opensource-src-4.7.1
CONTRIB_DIR := $(REP_DIR)/contrib/$(QT4)
# tell make where to look for source codes
vpath %.h $(CONTRIB_DIR)/qmake