Changeset 76602 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 2, 2019 4:03:13 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: GCC precompiled headers hacking.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• .scm-settings (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• precomptricks (added)
• precomptricks/QApplication (added)
• precomptricks/QChar (added)
• precomptricks/QDir (added)
• precomptricks/QGroupBox (added)
• precomptricks/QHBoxLayout (added)
• precomptricks/QLineEdit (added)
• precomptricks/QMap (added)
• precomptricks/QMenu (added)
• precomptricks/QMetaType (added)
• precomptricks/QMutex (added)
• precomptricks/QObject (added)
• precomptricks/QPainter (added)
• precomptricks/QPixmap (added)
• precomptricks/QPointer (added)
• precomptricks/QPushButton (added)
• precomptricks/QRadioButton (added)
• precomptricks/QRect (added)
• precomptricks/QString (added)
• precomptricks/QStringList (added)
• precomptricks/QStyle (added)
• precomptricks/QSysInfo (added)
• precomptricks/QTimer (added)
• precomptricks/QUuid (added)
• precomptricks/QVBoxLayout (added)
• precomptricks/QVarLengthArray (added)
• precomptricks/QVariant (added)
• precomptricks/QVector (added)
• precomptricks/QWidget (added)
• src/precomp_gcc.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/.scm-settings

@@ -24 +24 @@
 /src/precomp_gcc.h: --no-fix-header-guards
 
+/precomptricks/*:   --no-fix-header-guards --no-update-license --treat-as .h
+

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -2299 +2299 @@
   #VirtualBoxVM_CXXFLAGS.linux += -H
 
+  # GCC precompiled headers seems to work more efficiently when #pragma once is involved.
+  # So, we've cooked our own camel cased qt wrapper headers with #pragma once inside.
+  VBOX_GUI_INC_DIRS <= precomptricks
+
  else if 0 # Obsolete experiment - non-functional.  Needs to be redone the same way as on windows.
   VirtualBox_DEFS           += VBOX_WITH_PRECOMPILED_HEADERS

trunk/src/VBox/Frontends/VirtualBox/src/precomp_gcc.h

@@ -24 +24 @@
  *       ourselves to frequently used QT, compiler, and system headers.
  */
+
+/* Some CRT stuff that's frequently used. */
 #include <new>
 #include <stdlib.h>
-
-#include <QVariant>
-#include <QVarLengthArray>
-#include <QMutex>
-#include <QSysInfo>
-#include <QString>
-#include <QChar>
-
-#include <QApplication>
-
-#include <QGroupBox>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QVBoxLayout>
 
 /* The most frequently used qt headers on a linux hosts based on dependency files. */
@@ -124 +112 @@
 #include <QtGui/qfontinfo.h> /* 496 */
 
-/* toplevel headers for which we already include the sub-headers. */
+/* Toplevel headers for which we already include the sub-headers.
+   Note! Must exist in precomptricks so we can apply #pragma once to them (good for GCC). */
+#include <QVariant>
+#include <QVarLengthArray>
+#include <QMutex>
+#include <QSysInfo>
+#include <QString>
+#include <QStringList>
+#include <QChar>
+#include <QApplication>
+#include <QGroupBox>
+#include <QPushButton>
+#include <QRadioButton>
 #include <QObject>
 #include <QVector>
@@ -130 +130 @@
 #include <QMetaType>
 #include <QRect>
-#include <QString>
-#include <QStringList>
 #include <QWidget>
 #include <QPixmap>
+
+/* misc others that we include a bit. */
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QPainter>
+#include <QTimer>
+#include <QStyle>
+#include <QMenu>
+#include <QDir>
+#include <QUuid>
+#include <QLineEdit>
 
 /* cdefs.h is a little bit of a question since it defines RT_STRICT, which someone
@@ -152 +161 @@
 #include <VBox/com/defs.h>
 
+/* These two are freuqently used internal headers. */
 #include "UILibraryDefs.h"
 #include "QIWithRetranslateUI.h"