generic: adjust tests to KApplication and Katie changes

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-06-30 14:09:19 +00:00
parent 1f90237e4f
commit face85bda5
4 changed files with 5 additions and 9 deletions

View file

@ -134,7 +134,7 @@ int main(int argc, char *argv[])
options.add("+crash|malloc|div0|assert|threads", ki18n("Type of crash.")); options.add("+crash|malloc|div0|assert|threads", ki18n("Type of crash."));
KCmdLineArgs::addCmdLineOptions(options); KCmdLineArgs::addCmdLineOptions(options);
KApplication app(false); KApplication app;
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
//start drkonqi directly so that drkonqi's output goes to the console //start drkonqi directly so that drkonqi's output goes to the console

View file

@ -6,7 +6,8 @@
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
QApplication app(argc, argv, "testicons"); QApplication app(argc, argv);
app.setApplicationName("testicons");
KComponentData componentData("testicons"); KComponentData componentData("testicons");
KIconConfig *w = new KIconConfig(componentData, 0L); KIconConfig *w = new KIconConfig(componentData, 0L);
w->show(); w->show();

View file

@ -72,11 +72,6 @@ void DeclarativeView::showEvent(QShowEvent *event)
Q_UNUSED(event) Q_UNUSED(event)
} }
void DeclarativeView::resizeEvent(QResizeEvent *event)
{
Q_UNUSED(event)
}
void DeclarativeView::hideEvent(QHideEvent *event) void DeclarativeView::hideEvent(QHideEvent *event)
{ {
Q_UNUSED(event) Q_UNUSED(event)

View file

@ -454,12 +454,12 @@ void ModelTest::data()
} }
// General Purpose roles that should return a QColor // General Purpose roles that should return a QColor
QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundColorRole ); QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundRole );
if ( colorVariant.isValid() ) { if ( colorVariant.isValid() ) {
Q_ASSERT ( colorVariant.canConvert<QColor>() ); Q_ASSERT ( colorVariant.canConvert<QColor>() );
} }
colorVariant = model->data ( model->index ( 0, 0 ), Qt::TextColorRole ); colorVariant = model->data ( model->index ( 0, 0 ), Qt::ForegroundRole );
if ( colorVariant.isValid() ) { if ( colorVariant.isValid() ) {
Q_ASSERT ( colorVariant.canConvert<QColor>() ); Q_ASSERT ( colorVariant.canConvert<QColor>() );
} }