fix scons

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19491 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 162fc034df3143c83846c0b13cb3946bfa4f8ec1..4684f7d7d6048a316050d6ab1321e29d8aab41c8 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -1657,6 +1657,15 @@ if build_support:
     support = frontend_env.StaticLibrary(
         target = '$LOCALLIBPATH/support',
         source = ['$BUILDDIR/common/support/%s' % x for x in src_support_files] + Package_cpp,
+        CCFLAGS =  [
+            '$CCFLAGS',
+            '-DHAVE_CONFIG_H',
+            '-DQT_CLEAN_NAMESPACE',
+            '-DQT_GENUINE_STR',
+            '-DQT_NO_STL',
+            '-DQT_NO_KEYWORDS',
+        ]
+
     )
     Alias('support', support)
 
@@ -1734,23 +1743,9 @@ if build_qt4:
 
     print "Processing files in src/frontends/qt4..."
 
-    qt4_moc_files = ["$BUILDDIR/common/frontends/qt4/%s" % x for x in src_frontends_qt4_moc_files]
-
-    #
-    # Compile resources
-    #
-    resources = [frontend_env.Uic4(x.split('.')[0]) for x in \
-        ["$BUILDDIR/common/frontends/qt4/ui/%s" % x for x in src_frontends_qt4_ui_files]]
-
     #
     # moc qt4_moc_files, the moced files are included in the original files
     #
-
-#    qt4_moced_files = [frontend_env.Moc4(x.replace('.cpp', '_moc.cpp'), \
-#        x.replace('.cpp', '.h')) for x in qt4_moc_files]
-
-    qt4_moced_files = [frontend_env.Moc4(x.replace('.cpp', '_moc.cpp'), x.replace('.cpp', '.h')) for x in qt4_moc_files]
-
     qt4 = frontend_env.StaticLibrary(
         target = '$LOCALLIBPATH/qt4',
         source = ['$BUILDDIR/common/frontends/qt4/%s' % x for x in src_frontends_qt4_files],
@@ -1760,6 +1755,7 @@ if build_qt4:
             '$BUILDDIR/common/images',
             '$BUILDDIR/common/frontends',
             '$BUILDDIR/common/frontends/qt4',
+            '$BUILDDIR/common/frontends/qt4/ui',
             '$BUILDDIR/common/frontends/controllers'
         ],
         CCFLAGS =  [

diff --git a/development/scons/qt4.py b/development/scons/qt4.py
index 360eceef116e9d43a3b0880b9cb1197a8f1400de..c42865a713cf7d42612f584c5b66e3e9ab88c6cb 100644 (file)
--- a/development/scons/qt4.py
+++ b/development/scons/qt4.py
@@ -267,7 +267,7 @@ def generate(env):
                action='$QT4_UIC4COM',
                src_suffix='$QT4_UISUFFIX',
                suffix='$QT4_UICDECLSUFFIX',
-               #prefix='$QT4_UICDECLPREFIX',
+               prefix='$QT4_UICDECLPREFIX',
                single_source = True
                )
        env.Append( BUILDERS = { 'Uic4': uic4builder } )

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index bda8fc102521383ff7a6454b3cfb82f36424a231..61ccfe36447698bd91254f703b233ca2a5e77d24 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -300,6 +300,7 @@ src_support_header_files = Split('''
     Path.h
     RandomAccessList.h
     Systemcall.h
+    Timeout.h
     Translator.h
     convert.h
     copied_ptr.h
@@ -339,6 +340,7 @@ src_support_files = Split('''
     ForkedcallsController.cpp
     Path.cpp
     Systemcall.cpp
+    Timeout.cpp
     abort.cpp
     chdir.cpp
     convert.cpp
@@ -681,7 +683,6 @@ src_frontends_header_files = Split('''
     NoGuiFontMetrics.h
     Painter.h
     Selection.h
-    Timeout.h
     Toolbars.h
     WorkArea.h
     alert.h
@@ -695,7 +696,6 @@ src_frontends_files = Split('''
     Dialogs.cpp
     LyXView.cpp
     Painter.cpp
-    Timeout.cpp
     Toolbars.cpp
     WorkArea.cpp
     alert.cpp
@@ -906,7 +906,6 @@ src_frontends_qt4_header_files = Split('''
     UrlView.h
     Validator.h
     qlkey.h
-    qtTimeout.h
     qt_helpers.h
     socket_callback.h
 ''')
@@ -996,82 +995,11 @@ src_frontends_qt4_files = Split('''
     UrlView.cpp
     Validator.cpp
     alert_pimpl.cpp
-    qtTimeout.cpp
     qt_helpers.cpp
     socket_callback.cpp
 ''')
 
 
-src_frontends_qt4_moc_files = Split('''
-    Action.cpp
-    BulletsModule.cpp
-    EmptyTable.cpp
-    FloatPlacement.cpp
-    GuiApplication.cpp
-    GuiImplementation.cpp
-    GuiView.cpp
-    GuiWorkArea.cpp
-    IconPalette.cpp
-    InsertTableWidget.cpp
-    LengthCombo.cpp
-    LyXFileDialog.cpp
-    PanelStack.cpp
-    QAbout.cpp
-    QBibitem.cpp
-    QBibtex.cpp
-    QBox.cpp
-    QBranch.cpp
-    QBranches.cpp
-    QChanges.cpp
-    QCharacter.cpp
-    QCitationDialog.cpp
-    QCommandBuffer.cpp
-    QCommandEdit.cpp
-    QDelimiterDialog.cpp
-    QDialogView.cpp
-    QDocument.cpp
-    QERT.cpp
-    QErrorList.cpp
-    QExternal.cpp
-    QFloatDialog.cpp
-    QGraphicsDialog.cpp
-    QInclude.cpp
-    QIndex.cpp
-    QListings.cpp
-    QLMenubar.cpp
-    QLPopupMenu.cpp
-    QLPrintDialog.cpp
-    QLToolbar.cpp
-    QLog.cpp
-    QLog.cpp
-    QMathMatrixDialog.cpp
-    QNomencl.cpp
-    QNomencl.cpp
-    QNote.cpp
-    QParagraph.cpp
-    QPrefs.cpp
-    QRef.cpp
-    QSearch.cpp
-    QSendto.cpp
-    QSetBorder.cpp
-    QShowFile.cpp
-    QSpellchecker.cpp
-    QTabular.cpp
-    QTabularCreate.cpp
-    QTexinfo.cpp
-    QThesaurus.cpp
-    QToc.cpp
-    QURLDialog.cpp
-    QVSpace.cpp
-    QViewSource.cpp
-    QWrap.cpp
-    TocModel.cpp
-    TocWidget.cpp
-    Validator.cpp
-    socket_callback.cpp
-''')
-
-
 src_frontends_qt4_extra_files = Split('''
     ChangeLog
     GuiFontMetrics.h
@@ -2628,6 +2556,7 @@ lib_lyx2lyx_files = Split('''
     lyx_1_3.py
     lyx_1_4.py
     lyx_1_5.py
+    lyx_1_6.py
     parser_tools.py
     profiling.py
     test_parser_tools.py