build xremoteclient when building qt. a=leaf remove XIFF converter from qt build. checking in for John C. Griggs <johng@corel.com>

This commit is contained in:
blizzard%redhat.com 2000-10-30 19:26:53 +00:00
Родитель eaf8a0ac91
Коммит 489d55f001
2 изменённых файлов: 7 добавлений и 9 удалений

Просмотреть файл

@ -55,6 +55,7 @@ endif
ifdef MOZ_ENABLE_QT
DIRS += qt
DIRS += xremoteclient
endif
ifdef MOZ_ENABLE_PHOTON

Просмотреть файл

@ -37,7 +37,7 @@
#include "nsLabel.h"
#include "nsTransferable.h"
#include "nsClipboard.h"
#include "nsXIFFormatConverter.h"
#include "nsHTMLFormatConverter.h"
#include "nsFontRetrieverService.h"
#include "nsDragService.h"
#include "nsFileSpecWithUIImpl.h"
@ -55,7 +55,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsLookAndFeel)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLabel)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboard)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsXIFFormatConverter)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontRetrieverService)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFileSpecWithUIImpl)
@ -76,7 +76,6 @@ static nsresult nsHorizScrollbarConstructor (nsISupports *aOuter, REFNSIID aIID,
rv = NS_ERROR_NO_AGGREGATION;
return rv;
}
inst = (nsISupports *)(nsBaseWidget *)(nsWidget *)new nsScrollbar(PR_FALSE);
if (inst == NULL)
{
@ -105,7 +104,6 @@ static nsresult nsVertScrollbarConstructor (nsISupports *aOuter, REFNSIID aIID,
rv = NS_ERROR_NO_AGGREGATION;
return rv;
}
inst = (nsISupports *)(nsBaseWidget *)(nsWidget *)new nsScrollbar(PR_TRUE);
if (inst == NULL)
{
@ -116,7 +114,6 @@ static nsresult nsVertScrollbarConstructor (nsISupports *aOuter, REFNSIID aIID,
NS_RELEASE(inst);
return rv;
}
static nsModuleComponentInfo components[] =
@ -177,10 +174,10 @@ static nsModuleComponentInfo components[] =
NS_CLIPBOARD_CID,
"@mozilla.org/widget/clipboard;1",
nsClipboardConstructor },
{ "XIF Format Converter",
NS_XIFFORMATCONVERTER_CID,
"@mozilla.org/widget/xifformatconverter/qt;1",
nsXIFFormatConverterConstructor },
{ "HTML Format Converter",
NS_HTMLFORMATCONVERTER_CID,
"@mozilla.org/widget/htmlformatconverter/qt;1",
nsHTMLFormatConverterConstructor },
{ "Qt Font Retriever Service",
NS_FONTRETRIEVERSERVICE_CID,
"@mozilla.org/widget/fontretrieverservice/qt;1",