Do not yet emit deprecation warnings for loadFile() and loadExtension()

This will flood our users' non-trivial projects with warnings, and
fixing them will prevent the project from building with 1.7.
Our approach for this kind of thing should probably be:
Version x: Public announcement of deprecation
Version x+1: Deprecation warning
Version x+n: Removal (n == 2, if possible)

Change-Id: Id04372074866259e92b92cb11e762828a1ef8efd
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

2 files changed, 15 insertions, 12 deletions

diff --git a/src/lib/corelib/language/scriptengine.cpp b/src/lib/corelib/language/scriptengine.cpp
index b1a992b53..5000d5892 100644
--- a/src/lib/corelib/language/scriptengine.cpp
+++ b/src/lib/corelib/language/scriptengine.cpp
@@ -341,33 +341,35 @@ static QScriptValue loadInternalExtension(QScriptContext *context, ScriptEngine
 
 QScriptValue ScriptEngine::js_loadExtension(QScriptContext *context, QScriptEngine *qtengine)
 {
-    ScriptEngine *engine = static_cast<ScriptEngine *>(qtengine);
     if (context->argumentCount() < 1) {
         return context->throwError(
                     ScriptEngine::tr("The loadExtension function requires "
                                      "an extension name."));
     }
 
-    ErrorInfo deprWarning(Tr::tr("The loadExtension() function is deprecated and will be "
-                                 "removed in a future version of Qbs. Use require() "
-                                 "instead."), context->backtrace());
-    engine->logger().printWarning(deprWarning);
+    // TODO: Enable in 1.9
+    // ScriptEngine *engine = static_cast<ScriptEngine *>(qtengine);
+    // ErrorInfo deprWarning(Tr::tr("The loadExtension() function is deprecated and will be "
+    //                              "removed in a future version of Qbs. Use require() "
+    //                              "instead."), context->backtrace());
+    // engine->logger().printWarning(deprWarning);
 
     return js_require(context, qtengine);
 }
 
 QScriptValue ScriptEngine::js_loadFile(QScriptContext *context, QScriptEngine *qtengine)
 {
-    ScriptEngine *engine = static_cast<ScriptEngine *>(qtengine);
     if (context->argumentCount() < 1) {
         return context->throwError(
                     ScriptEngine::tr("The loadFile function requires a file path."));
     }
 
-    ErrorInfo deprWarning(Tr::tr("The loadFile() function is deprecated and will be "
-                                 "removed in a future version of Qbs. Use require() "
-                                 "instead."), context->backtrace());
-    engine->logger().printWarning(deprWarning);
+    // TODO: Enable in 1.9
+    // ScriptEngine *engine = static_cast<ScriptEngine *>(qtengine);
+    // ErrorInfo deprWarning(Tr::tr("The loadFile() function is deprecated and will be "
+    //                              "removed in a future version of Qbs. Use require() "
+    //                              "instead."), context->backtrace());
+    // engine->logger().printWarning(deprWarning);
 
     return js_require(context, qtengine);
 }
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index b986d3c49..ef587cba4 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -3294,9 +3294,10 @@ void TestBlackbox::requireDeprecated()
 {
     QDir::setCurrent(testDataDir + "/require-deprecated");
     QCOMPARE(runQbs(), 0);
-    QVERIFY2(m_qbsStderr.contains("loadExtension() function is deprecated"),
+    // TODO: Revert conditions in 1.9
+    QVERIFY2(!m_qbsStderr.contains("loadExtension() function is deprecated"),
              m_qbsStderr.constData());
-    QVERIFY2(m_qbsStderr.contains("loadFile() function is deprecated"),
+    QVERIFY2(!m_qbsStderr.contains("loadFile() function is deprecated"),
              m_qbsStderr.constData());
 }