VirtualBox

Changeset 76600 in vbox for trunk


Ignore:
Timestamp:
Jan 2, 2019 2:05:40 AM (6 years ago)
Author:
vboxsync
Message:

FE/Qt: GCC precompiled headers hacking.

Location:
trunk/src/VBox/Frontends/VirtualBox
Files:
12 edited
1 copied

Legend:

Unmodified
Added
Removed

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

    r76553 r76600  
    22862286  VBoxGlobal_PCH_HDR   := $(PATH_SUB_CURRENT)/src/precomp_vcc.h
    22872287
     2288 else if $(KMK_REVISION) >= 3250 && "$(KBUILD_TARGET)" != "darwin" && !defined(VBOX_WITHOUT_PRECOMPILED_HEADERS) && !defined(KBUILD_USE_KOBJCACHE)
     2289  VBoxGlobal_USES      += gccprecomp
     2290  VBoxGlobal_PCH_HDR   := $(PATH_SUB_CURRENT)/src/precomp_gcc.h
     2291  #VBoxGlobal_CXXFLAGS.linux += -H
     2292
     2293  VirtualBox_USES      += gccprecomp
     2294  VirtualBox_PCH_HDR   := $(PATH_SUB_CURRENT)/src/precomp_gcc.h
     2295  #VirtualBox_CXXFLAGS.linux += -H
     2296
     2297  VirtualBoxVM_USES    += gccprecomp
     2298  VirtualBoxVM_PCH_HDR := $(PATH_SUB_CURRENT)/src/precomp_gcc.h
     2299  #VirtualBoxVM_CXXFLAGS.linux += -H
     2300
    22882301 else if 0 # Obsolete experiment - non-functional.  Needs to be redone the same way as on windows.
    22892302  VirtualBox_DEFS           += VBOX_WITH_PRECOMPILED_HEADERS
    … …  
    26102623
    26112624
    2612 
    26132625# Commit the magic.
    26142626# (note: before custom rules that make usage of generated variables!).

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp

    r76553 r76600  
    3232
    3333/* VirtualBox interface declarations: */
    34 #ifndef VBOX_WITH_XPCOM
    35 # include "VirtualBox.h"
    36 #else /* !VBOX_WITH_XPCOM */
    37 # include "VirtualBox_XPCOM.h"
    38 #endif /* VBOX_WITH_XPCOM */
     34#include <VBox/com/VirtualBox.h>
    3935
    4036/* Other VBox includes: */

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/COMWrappers.xsl

    r76012 r76600  
    304304    <xsl:text>/* VirtualBox interface declarations: */&#x0A;</xsl:text>
    305305    <xsl:text>#ifndef VBOX_WITH_LESS_VIRTUALBOX_INCLUDING&#x0A;</xsl:text>
    306     <xsl:text># ifndef VBOX_WITH_XPCOM&#x0A;</xsl:text>
    307     <xsl:text>#  include "VirtualBox.h"&#x0A;</xsl:text>
    308     <xsl:text># else /* !VBOX_WITH_XPCOM */&#x0A;</xsl:text>
    309     <xsl:text>#  include "VirtualBox_XPCOM.h"&#x0A;</xsl:text>
    310     <xsl:text># endif /* VBOX_WITH_XPCOM */&#x0A;</xsl:text>
     306    <xsl:text># include &lt;VBox/com/VirtualBox.h&gt;&#x0A;</xsl:text>
    311307    <xsl:text>#else&#x0A;</xsl:text>
    312308    <xsl:text>COM_STRUCT_OR_CLASS(</xsl:text><xsl:value-of select="@name"/><xsl:text>);&#x0A;</xsl:text>

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

    r76553 r76600  
    135135
    136136/* VirtualBox interface declarations: */
    137 #ifndef VBOX_WITH_XPCOM
    138 # include "VirtualBox.h"
    139 #else /* !VBOX_WITH_XPCOM */
    140 # include "VirtualBox_XPCOM.h"
    141 #endif /* VBOX_WITH_XPCOM */
     137#include <VBox/com/VirtualBox.h>
    142138
    143139/* Qt includes: */

  • trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIMachinePreview.cpp

    r76553 r76600  
    4343
    4444/* VirtualBox interface declarations: */
    45 #ifndef VBOX_WITH_XPCOM
    46 # include "VirtualBox.h"
    47 #else /* !VBOX_WITH_XPCOM */
    48 # include "VirtualBox_XPCOM.h"
    49 #endif /* VBOX_WITH_XPCOM */
     45#include <VBox/com/VirtualBox.h>
     46
    5047
    5148UIMachinePreview::UIMachinePreview(QIGraphicsWidget *pParent)

  • trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp

    r76553 r76600  
    3131#include <X11/Xatom.h>
    3232#include <X11/Xlib.h>
     33#undef BOOL /* VBox/com/defs.h conflict */
    3334#include <X11/extensions/dpms.h>
    3435RT_C_DECLS_END

  • trunk/src/VBox/Frontends/VirtualBox/src/precomp.h

    r76553 r76600  
    260260 * VirtualBox COM API
    261261 */
    262 #ifdef VBOX_WITH_XPCOM
    263 # include <VirtualBox_XPCOM.h>
    264 #else
    265 # include <VirtualBox.h>
    266 #endif
     262#include <VBox/com/VirtualBox.h>
    267263
    268264/*

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

    r76588 r76600  
    2222 * Note! We do not include iprt/log.h or similar because we need to
    2323 *       support selecting different log groups.  So, for now we restrict
    24  *       ourselves to frequently used QT, compiler, and SDK headers.
     24 *       ourselves to frequently used QT, compiler, and system headers.
    2525 */
     26#include <new>
     27#include <stdlib.h>
     28
    2629#include <QVariant>
    2730#include <QVarLengthArray>
    … …  
    3841#include <QVBoxLayout>
    3942
    40 /* The most frequently used qt headers on windows hosts based on dependency files. */
    41 #include <qalgorithms.h>
    42 #include <qarraydata.h>
    43 #include <qatomic.h>
    44 #include <qatomic_msvc.h>
    45 #include <qbasicatomic.h>
    46 #include <qbytearray.h>
    47 #include <qchar.h>
    48 #include <qcompilerdetection.h>
    49 #include <qconfig.h>
    50 #include <qcontainerfwd.h>
    51 #include <qfeatures.h>
    52 #include <qflags.h>
    53 #include <qgenericatomic.h>
    54 #include <qglobalstatic.h>
    55 #include <qisenum.h>
    56 #include <qlogging.h>
    57 #include <qmutex.h>
    58 #include <qnamespace.h>
    59 #include <qnumeric.h>
    60 #include <qobjectdefs.h>
    61 #include <qprocessordetection.h>
    62 #include <qrefcount.h>
    63 #include <qstring.h>
    64 #include <qsysinfo.h>
    65 #include <qsystemdetection.h>
    66 #include <qtypeinfo.h>
    67 #include <qvarlengtharray.h>
    68 #include <qpair.h>
    69 #include <qmetatype.h>
    70 #include <qobject.h>
    71 #include <qscopedpointer.h>
    72 #include <qglobal.h>
    73 #include <qbytearraylist.h>
    74 #include <qiterator.h>
    75 #include <qlist.h>
    76 #include <qregexp.h>
    77 #include <qstringlist.h>
    78 #include <qstringmatcher.h>
    79 #include <qtypetraits.h>
     43#include <QtCore/QObject>
    8044
    81 /* Less frequently included: */
    82 #include <QtWidgets/QGraphicsWidget>
    83 #include <QtWidgets/qgraphicsitem.h>
    84 #include <QtWidgets/qgraphicslayoutitem.h>
    85 #include <QtWidgets/qgraphicswidget.h>
    86 #include <QtCore/QMetaType>
    87 #include <QtGui/qevent.h>
    88 #include <QtGui/qtouchdevice.h>
    89 #include <QtGui/qvector2d.h>
    90 #include <QtCore/QEvent>
    91 #include <QtGui/qguiapplication.h>
    92 #include <QtGui/qinputmethod.h>
    93 #include <QtWidgets/QApplication>
    94 #include <QtWidgets/qapplication.h>
    95 #include <QtCore/qcoreapplication.h>
    96 #include <QtCore/qeventloop.h>
    97 #include <QtCore/qurl.h>
    98 #include <QtCore/qset.h>
    99 #include <QtCore/qfile.h>
    100 #include <QtCore/qfiledevice.h>
    101 #include <QtCore/qlocale.h>
    102 #include <QtCore/qcoreevent.h>
    103 #include <QtCore/QObject>
    104 #include <QtWidgets/qwidget.h>
    105 #include <QtCore/qvariant.h>
    106 #include <QtGui/qfontinfo.h>
    107 #include <QtGui/qfontmetrics.h>
    108 #include <QtGui/qcursor.h>
    109 #include <QtWidgets/qsizepolicy.h>
    110 #include <QtGui/qkeysequence.h>
    111 #include <QtGui/qpalette.h>
    112 #include <QtGui/qbrush.h>
    113 #include <QtGui/qfont.h>
    114 #include <QtCore/qmap.h>
    115 #include <QtCore/qline.h>
    116 #include <QtGui/qcolor.h>
    117 #include <QtGui/qimage.h>
    118 #include <QtGui/qmatrix.h>
    119 #include <QtGui/qpaintdevice.h>
    120 #include <QtGui/qpainterpath.h>
    121 #include <QtGui/qpixelformat.h>
    122 #include <QtGui/qpixmap.h>
    123 #include <QtGui/qpolygon.h>
    124 #include <QtGui/qrgb.h>
    125 #include <QtGui/qtransform.h>
    126 #include <QtCore/qdatastream.h>
    127 #include <QtGui/qregion.h>
    128 #include <QtGui/qwindowdefs.h>
    129 #include <QtGui/qwindowdefs_win.h>
    130 #include <QtCore/qiodevice.h>
    131 #include <QtCore/qsharedpointer.h>
    132 #include <QtCore/qshareddata.h>
    133 #include <QtCore/qvector.h>
    134 #include <QtCore/qmargins.h>
    135 #include <QtCore/qrect.h>
    136 #include <QtCore/qpoint.h>
    137 #include <QtCore/qsize.h>
    138 #include <QtCore/qhash.h>
     45/* The most frequently used qt headers on a linux hosts based on dependency files. */
     46#include <QtCore/qobject.h> /* 1003 */
     47#include <QtCore/qmetatype.h> /* 958 */
     48#include <QtCore/qstring.h> /* 923 */
     49#include <QtCore/qstringlist.h> /* 905 */
     50#include <QtCore/qrect.h> /* 858 */
     51#include <QtCore/qvector.h> /* 853 */
     52#include <QtCore/qmap.h> /* 849 */
     53#include <QtCore/qcoreevent.h> /* 838 */
     54#include <QtWidgets/qwidget.h> /* 826 */
     55#include <QtCore/qpair.h> /* 698 */
     56#include <QtCore/qlist.h> /* 682 */
     57#include <QtGui/qpixmap.h> /* 670 */
     58#include <QtCore/qhash.h> /* 637 */
     59#include <QtCore/qsize.h> /* 627 */
     60#include <QtCore/qglobal.h> /* 591 */
     61#include <QtCore/qvariant.h> /* 588 */
     62#include <QtCore/qregexp.h> /* 587 */
     63#include <QtCore/qversiontagging.h> /* 585 */
     64#include <QtCore/qtypeinfo.h> /* 585 */
     65#include <QtCore/qtcore-config.h> /* 585 */
     66#include <QtCore/qsystemdetection.h> /* 585 */
     67#include <QtCore/qsysinfo.h> /* 585 */
     68#include <QtCore/qstringview.h> /* 585 */
     69#include <QtCore/qstringliteral.h> /* 585 */
     70#include <QtCore/qstringalgorithms.h> /* 585 */
     71#include <QtCore/qrefcount.h> /* 585 */
     72#include <QtCore/qprocessordetection.h> /* 585 */
     73#include <QtCore/qnumeric.h> /* 585 */
     74#include <QtCore/qnamespace.h> /* 585 */
     75#include <QtCore/qlogging.h> /* 585 */
     76#include <QtCore/qglobalstatic.h> /* 585 */
     77#include <QtCore/qgenericatomic.h> /* 585 */
     78#include <QtCore/qflags.h> /* 585 */
     79#include <QtCore/qconfig.h> /* 585 */
     80#include <QtCore/qcompilerdetection.h> /* 585 */
     81#include <QtCore/qchar.h> /* 585 */
     82#include <QtCore/qbytearray.h> /* 585 */
     83#include <QtCore/qbasicatomic.h> /* 585 */
     84#include <QtCore/qatomic_cxx11.h> /* 585 */
     85#include <QtCore/qatomic.h> /* 585 */
     86#include <QtCore/qarraydata.h> /* 585 */
     87#include <QtCore/qstringmatcher.h> /* 584 */
     88#include <QtCore/qiterator.h> /* 584 */
     89#include <QtCore/qhashfunctions.h> /* 584 */
     90#include <QtCore/qbytearraylist.h> /* 584 */
     91#include <QtCore/qalgorithms.h> /* 584 */
     92#include <QtCore/qvarlengtharray.h> /* 580 */
     93#include <QtCore/qobjectdefs.h> /* 580 */
     94#include <QtCore/qcontainerfwd.h> /* 580 */
     95#include <QtCore/qscopedpointer.h> /* 577 */
     96#include <QtGui/qcolor.h> /* 574 */
     97#include <QtCore/qpoint.h> /* 549 */
     98#include <QtGui/qtransform.h> /* 546 */
     99#include <QtCore/qmargins.h> /* 544 */
     100#include <QtCore/qshareddata.h> /* 536 */
     101#include <QtGui/qimage.h> /* 532 */
     102#include <QtCore/qsharedpointer.h> /* 532 */
     103#include <QtGui/qkeysequence.h> /* 531 */
     104#include <QtGui/qcursor.h> /* 530 */
     105#include <QtCore/qiodevice.h> /* 530 */
     106#include <QtGui/qtguiglobal.h> /* 528 */
     107#include <QtGui/qtgui-config.h> /* 528 */
     108#include <QtGui/qwindowdefs.h> /* 527 */
     109#include <QtGui/qregion.h> /* 527 */
     110#include <QtGui/qrgba64.h> /* 526 */
     111#include <QtGui/qrgb.h> /* 526 */
     112#include <QtGui/qpolygon.h> /* 526 */
     113#include <QtGui/qpixelformat.h> /* 526 */
     114#include <QtGui/qpainterpath.h> /* 526 */
     115#include <QtGui/qpaintdevice.h> /* 526 */
     116#include <QtGui/qmatrix.h> /* 526 */
     117#include <QtCore/qline.h> /* 526 */
     118#include <QtCore/qdatastream.h> /* 526 */
     119#include <QtWidgets/qtwidgetsglobal.h> /* 520 */
     120#include <QtWidgets/qtwidgets-config.h> /* 520 */
     121#include <QtGui/qfont.h> /* 507 */
     122#include <QtGui/qbrush.h> /* 507 */
     123#include <QtGui/qpalette.h> /* 506 */
     124#include <QtWidgets/qsizepolicy.h> /* 505 */
     125#include <QtGui/qfontmetrics.h> /* 497 */
     126#include <QtGui/qfontinfo.h> /* 496 */
    139127
    140 /* cdefs.h is a little bit of a question since it defines RT_STRICT, which
    141    someone may want to redefine locally. But we need it for windows.h. */
     128/* cdefs.h is a little bit of a question since it defines RT_STRICT, which someone
     129   may want to redefine locally, but it's required by all other IPRT VBox includes. */
    142130#include <iprt/cdefs.h>
    143 #include <iprt/win/windows.h>
    144131#include <iprt/types.h>
     132#include <iprt/stdarg.h>
     133#include <iprt/stdint.h>
     134#include <iprt/assert.h>
     135#include <iprt/assertcompile.h>
     136#include <iprt/errcore.h>
    145137#include <iprt/cpp/list.h>
    146138#include <iprt/cpp/meta.h>
    147 #include <iprt/cpp/ministring.h>
    148 #include <VBox/com/microatl.h>
     139#include <VBox/com/array.h>
     140#include <VBox/com/assert.h>
     141#include <VBox/com/ptr.h>
    149142#include <VBox/com/com.h>
    150 #include <VBox/com/array.h>
    151 #include <VBox/com/Guid.h>
    152 #include <VBox/com/string.h>
     143#include <VBox/com/defs.h>
     144
     145#include "UILibraryDefs.h"
     146#include "QIWithRetranslateUI.h"
    153147
    154148#if defined(Log) || defined(LogIsEnabled)

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp

    r76553 r76600  
    3030
    3131/* VirtualBox interface declarations: */
    32 #ifndef VBOX_WITH_XPCOM
    33 # include "VirtualBox.h"
    34 #else
    35 # include "VirtualBox_XPCOM.h"
    36 #endif
     32#include <VBox/com/VirtualBox.h>
    3733
    3834/* GUI includes: */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

    r76553 r76600  
    4949
    5050/* VirtualBox interface declarations: */
    51 #ifndef VBOX_WITH_XPCOM
    52 # include "VirtualBox.h"
    53 #else /* !VBOX_WITH_XPCOM */
    54 # include "VirtualBox_XPCOM.h"
    55 #endif /* VBOX_WITH_XPCOM */
     51#include <VBox/com/VirtualBox.h>
    5652
    5753/* Other VBox includes: */

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

    r76553 r76600  
    106106
    107107/* VirtualBox interface declarations: */
    108 #ifndef VBOX_WITH_XPCOM
    109 # include "VirtualBox.h"
    110 #else /* !VBOX_WITH_XPCOM */
    111 # include "VirtualBox_XPCOM.h"
    112 #endif /* VBOX_WITH_XPCOM */
     108#include <VBox/com/VirtualBox.h>
    113109
    114110#ifdef VBOX_WS_MAC

  • trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

    r76553 r76600  
    5151
    5252/* VirtualBox interface declarations: */
    53 # ifndef VBOX_WITH_XPCOM
    54 #  include "VirtualBox.h"
    55 # else /* VBOX_WITH_XPCOM */
    56 #  include "VirtualBox_XPCOM.h"
    57 # endif /* VBOX_WITH_XPCOM */
     53# include <VBox/com/VirtualBox.h>
    5854
    5955/* COM includes: */

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

    r76553 r76600  
    5050
    5151/* VirtualBox interface declarations: */
    52 #ifndef VBOX_WITH_XPCOM
    53 # include "VirtualBox.h"
    54 #else /* !VBOX_WITH_XPCOM */
    55 # include "VirtualBox_XPCOM.h"
    56 #endif /* VBOX_WITH_XPCOM */
     52#include <VBox/com/VirtualBox.h>
    5753
    5854
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette