diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-23 17:13:36 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-23 17:13:36 -0500 |
| commit | d3f7a9d6f1b8f6e24fb49aaa8caeaa7623ae48b5 (patch) | |
| tree | baeeba639393f46abab749f4700a250091c3cc16 /tqtinterface/qt4/src/qt.pro | |
| parent | d7be1694839bacae31e500ea9e36b3c13257ce28 (diff) | |
| download | experimental-d3f7a9d6f1b8f6e24fb49aaa8caeaa7623ae48b5.tar.gz experimental-d3f7a9d6f1b8f6e24fb49aaa8caeaa7623ae48b5.zip | |
Apply all Qt3.3.8d patches
NOTE: This will *likely* break compilation of TQt4
Please wait a few days for fixes to be committed as needed!
Diffstat (limited to 'tqtinterface/qt4/src/qt.pro')
| -rw-r--r-- | tqtinterface/qt4/src/qt.pro | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/tqtinterface/qt4/src/qt.pro b/tqtinterface/qt4/src/qt.pro index 9f91a6b..63e75d9 100644 --- a/tqtinterface/qt4/src/qt.pro +++ b/tqtinterface/qt4/src/qt.pro @@ -38,6 +38,7 @@ OPENGL_CPP = opengl TOOLS_CPP = tools CODECS_CPP = codecs WORKSPACE_CPP = workspace +INPUTMETHOD_CPP = inputmethod XML_CPP = xml STYLES_CPP = styles EMBEDDED_CPP = embedded @@ -55,6 +56,7 @@ win32 { TOOLS_H = $$TOOLS_CPP CODECS_H = $$CODECS_CPP WORKSPACE_H = $$WORKSPACE_CPP + #INPUTMETHOD_H = $$INPUTMETHOD_CPP XML_H = $$XML_CPP CANVAS_H = $$CANVAS_CPP STYLES_H = $$STYLES_CPP @@ -71,6 +73,7 @@ win32 { TOOLS_H = $$WIN_ALL_H CODECS_H = $$WIN_ALL_H WORKSPACE_H = $$WIN_ALL_H + #INPUTMETHOD_H = $$WIN_ALL_H XML_H = $$WIN_ALL_H CANVAS_H = $$WIN_ALL_H STYLES_H = $$WIN_ALL_H @@ -99,6 +102,7 @@ unix { TOOLS_H = $$TOOLS_CPP CODECS_H = $$CODECS_CPP WORKSPACE_H = $$WORKSPACE_CPP + INPUTMETHOD_H = $$INPUTMETHOD_CPP XML_H = $$XML_CPP STYLES_H = $$STYLES_CPP !embedded:!mac:CONFIG += x11 x11inc @@ -114,7 +118,7 @@ embedded { EMBEDDED_H = $$EMBEDDED_CPP } -DEPENDPATH += ;$$NETWORK_H;$$KERNEL_H;$$WIDGETS_H;$$SQL_H;$$TABLE_H;$$DIALOGS_H; +DEPENDPATH += ;$$NETWORK_H;$$KERNEL_H;$$WIDGETS_H;$$INPUTMETHOD_H;$$SQL_H;$$TABLE_H;$$DIALOGS_H; DEPENDPATH += $$ICONVIEW_H;$$OPENGL_H;$$TOOLS_H;$$CODECS_H;$$WORKSPACE_H;$$XML_H; DEPENDPATH += $$CANVAS_H;$$STYLES_H embedded:DEPENDPATH += ;$$EMBEDDED_H @@ -149,6 +153,7 @@ include($$WIDGETS_CPP/qt_widgets.pri) include($$DIALOGS_CPP/qt_dialogs.pri) include($$ICONVIEW_CPP/qt_iconview.pri) include($$WORKSPACE_CPP/qt_workspace.pri) +include($$INPUTMETHOD_CPP/qt_inputmethod.pri) include($$NETWORK_CPP/qt_network.pri) include($$CANVAS_CPP/qt_canvas.pri) include($$TABLE_CPP/qt_table.pri) @@ -176,6 +181,16 @@ unix { QMAKE_PKGCONFIG_INCDIR = $$headers.path } +unix { + # Debian - compile __debian_export_symbols.cpp with -fno-inline + debian_no_inline.output = .obj/${TQMAKE_FILE_BASE}.o + debian_no_inline.commands = $(CXX) -c $(CXXFLAGS) $(INCPATH) -fno-inline ${TQMAKE_FILE_NAME} -o ${TQMAKE_FILE_OUT} + debian_no_inline.input = DEBIAN_NO_INLINE + TQMAKE_EXTRA_UNIX_COMPILERS += debian_no_inline + + DEBIAN_NO_INLINE = __debian_export_symbols.cpp +} + wince-* { CONFIG -= incremental message( ...removing plugin stuff... (not permanent) ) |