precompiled headers

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

diff --git a/development/qmake/config.pri b/development/qmake/config.pri
index 2e77f3843367c31802d85954559f26287b12444e..bf4a3dcb01b18fe4f0267306c0940f0312078e91 100644 (file)
--- a/development/qmake/config.pri
+++ b/development/qmake/config.pri
@@ -2,7 +2,10 @@
 TEMPLATE = lib
 
 CONFIG += debug_and_release
-CONFIG += create_prl
+#CONFIG += create_prl
+CONFIG += precompile_header
+
+DEFINE += QT_NO_KEYWORDS
 
 DESTDIR = ../lib
 
@@ -12,5 +15,7 @@ CONFIG(debug, debug|release) DEBUGSUFFIX = d
 BUILD_BASE_SOURCE_DIR = $$[BUILD_BASE_SOURCE_DIR]
 BUILD_BASE_TARGET_DIR = $$[BUILD_BASE_TARGET_DIR]
 
+PRECOMPILED_HEADER = $${BUILD_BASE_SOURCE_DIR}/src/pch.h
+
 # for <config.h>
 INCLUDEPATH += $${BUILD_BASE_TARGET_DIR}/src

diff --git a/development/qmake/frontends/frontends.pro b/development/qmake/frontends/frontends.pro
index 1493e0b4cc572dc30008a8352aadc730c271043f..89e4b08e65620726ee7401411f9ef4bb7083dc68 100644 (file)
--- a/development/qmake/frontends/frontends.pro
+++ b/development/qmake/frontends/frontends.pro
@@ -3,8 +3,6 @@ include(../config.pri)
 
 TARGET = lyxfrontends$${DEBUGSUFFIX}
 
-DEFINES += QT_NO_KEYWORDS
-
 INC += boost
 INC += src
 INC += src/support
@@ -24,7 +22,6 @@ HPP += NoGuiFontLoader.h
 HPP += NoGuiFontMetrics.h
 HPP += Painter.h
 HPP += Selection.h
-HPP += Timeout.h
 HPP += Toolbars.h
 HPP += WorkArea.h
 HPP += alert.h
@@ -35,7 +32,6 @@ CPP += Application.cpp
 CPP += Dialogs.cpp
 CPP += LyXView.cpp
 CPP += Painter.cpp
-CPP += Timeout.cpp
 CPP += Toolbars.cpp
 CPP += WorkArea.cpp
 CPP += alert.cpp

diff --git a/development/qmake/qt4/qt4.pro b/development/qmake/qt4/qt4.pro
index 8703b683ac910d2165dc4ab2387c5f2fde109211..994fb5bc525ac8bae6e417bcf8485911d2381f77 100644 (file)
--- a/development/qmake/qt4/qt4.pro
+++ b/development/qmake/qt4/qt4.pro
@@ -3,8 +3,6 @@ include(../config.pri)
 
 TARGET = lyxqt4$${DEBUGSUFFIX}
 
-DEFINES += QT_NO_KEYWORDS
-
 INC += boost
 INC += src
 INC += src/frontends
@@ -69,7 +67,6 @@ HPP += UrlView.h
 HPP += Validator.h
 HPP += QLPainter.h
 HPP += QFloat.h
-HPP += qtTimeout.h
 HPP += PanelStack.h
 HPP += QCommandBuffer.h
 HPP += QTexinfo.h
@@ -167,7 +164,6 @@ CPP += GuiApplication.cpp
 CPP += QKeySymbol.cpp
 CPP += QGraphicsDialog.cpp
 CPP += socket_callback.cpp
-CPP += qtTimeout.cpp
 CPP += QDelimiterDialog.cpp
 CPP += QLToolbar.cpp
 CPP += QAbout.cpp
@@ -258,7 +254,15 @@ UI += IncludeUi.ui
 UI += SendtoUi.ui
 
 BASE = $${BUILD_BASE_SOURCE_DIR}/src/frontends/qt4
+
+for(FILE,HPP) { XHPP += $${BASE}/$${FILE} }
+moc1.output  = ${QMAKE_FILE_BASE}_moc.cpp
+moc1.commands = moc ${QMAKE_FILE_NAME} -o ${QMAKE_FILE_OUT}
+moc1.depend_command = g++ -E -M ${QMAKE_FILE_NAME} | sed "s,^.*: ,,"
+moc1.input = XHPP
+QMAKE_EXTRA_COMPILERS += moc1
+
 for(FILE,CPP) { SOURCES += $${BASE}/$${FILE} }
-for(FILE,HPP) { HEADERS += $${BASE}/$${FILE} }
+#for(FILE,HPP) { HEADERS += $${BASE}/$${FILE} }
 for(FILE,UI) { FORMS += $${BASE}/ui/$${FILE} }
 for(PATH,INC) { INCLUDEPATH += $${BUILD_BASE_SOURCE_DIR}/$${PATH} }

diff --git a/development/qmake/src/src.pro b/development/qmake/src/src.pro
index 0df177d0991a8ef7b959054987b7a71a62d54792..ed85a17d1ab7f7b5bf618e91d0c768bc797708a4 100644 (file)
--- a/development/qmake/src/src.pro
+++ b/development/qmake/src/src.pro
@@ -7,8 +7,6 @@ TEMPLATE = lib
 
 QT =
 
-#DEFINES += QT_NO_KEYWORDS
-
 INC += src
 INC += boost
 
@@ -215,7 +213,6 @@ CPP += factory.cpp
 CPP += gettext.cpp
 CPP += lengthcommon.cpp
 CPP += lyxfind.cpp
-CPP += main1.cpp
 CPP += output.cpp
 CPP += output_docbook.cpp
 CPP += output_latex.cpp

diff --git a/development/qmake/support/support.pro b/development/qmake/support/support.pro
index 9747c11bdede1718752517c6251e153c10e0f659..2a6e1a5114310e3cbb7e796b28b553e521d8cc47 100644 (file)
--- a/development/qmake/support/support.pro
+++ b/development/qmake/support/support.pro
@@ -3,8 +3,6 @@ include(../config.pri)
 
 TARGET = lyxsupport$${DEBUGSUFFIX}
 
-DEFINES += QT_NO_KEYWORDS
-
 QT = core
 
 INC += boost