build fix

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp
index a86c787..1bfaa2c 100644 (file)
--- a/src/declarative/qml/qdeclarativeimport.cpp
+++ b/src/declarative/qml/qdeclarativeimport.cpp
@@ -872,7 +872,6 @@ QString QDeclarativeImportDatabase::resolvePlugin(const QDir &qmldirPath, const
     //  libfoo.so
 
     return resolvePlugin(qmldirPath, qmldirPluginPath, baseName, validSuffixList, QLatin1String("lib"));
-#endif
 }
 
 /*!

diff --git a/src/test/qplaintestlogger.cpp b/src/test/qplaintestlogger.cpp
index c54d1f0..9c337c6 100644 (file)
--- a/src/test/qplaintestlogger.cpp
+++ b/src/test/qplaintestlogger.cpp
@@ -317,7 +317,7 @@ void QPlainTestLogger::startLogging()
                              ", Qt %s\n", QTestResult::currentTestObjectName(), qVersion());
         }
     }
-    QTest::outputMessage(buf);
+    QAbstractTestLogger::outputString(buf);
 }
 
 void QPlainTestLogger::stopLogging()
@@ -334,7 +334,7 @@ void QPlainTestLogger::stopLogging()
                          QTestResult::passCount(), QTestResult::failCount(),
                          QTestResult::skipCount(), QTestResult::currentTestObjectName());
     }
-    QTest::outputMessage(buf);
+    QAbstractTestLogger::outputString(buf);
 
     QAbstractTestLogger::stopLogging();
 }