From b855240b782395f94315f43ea3e7e182299fac48 Mon Sep 17 00:00:00 2001
From: Matthew Vogt <matthew.vogt@nokia.com>
Date: Thu, 16 Feb 2012 14:43:03 +1000
Subject: Rename QDeclarative symbols to QQuick and QQml

Symbols beginning with QDeclarative are already exported
by the quick1 module.

Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.

Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
---
 tools/qmlmin/main.cpp   | 20 ++++++++++----------
 tools/qmlmin/qmlmin.pro |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'tools/qmlmin')

diff --git a/tools/qmlmin/main.cpp b/tools/qmlmin/main.cpp
index f59eedec84..8baa131b9a 100644
--- a/tools/qmlmin/main.cpp
+++ b/tools/qmlmin/main.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include <private/qdeclarativejsengine_p.h>
-#include <private/qdeclarativejslexer_p.h>
-#include <private/qdeclarativejsparser_p.h>
+#include <private/qqmljsengine_p.h>
+#include <private/qqmljslexer_p.h>
+#include <private/qqmljsparser_p.h>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QStringList>
 #include <QtCore/QFile>
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 //
 // QML/JS minifier
 //
-namespace QDeclarativeJS {
+namespace QQmlJS {
 
 enum RegExpFlag {
     Global     = 0x01,
@@ -66,7 +66,7 @@ enum RegExpFlag {
 
 class QmlminLexer: protected Lexer, public Directives
 {
-    QDeclarativeJS::Engine _engine;
+    QQmlJS::Engine _engine;
     QString _fileName;
     QString _directives;
 
@@ -492,7 +492,7 @@ bool Tokenize::parse(int startToken)
     return false;
 }
 
-} // end of QDeclarativeJS namespace
+} // end of QQmlJS namespace
 
 static void usage(bool showHelp = false)
 {
@@ -571,7 +571,7 @@ int runQmlmin(int argc, char *argv[])
     const QString code = QString::fromUtf8(file.readAll()); // QML files are UTF-8 encoded.
     file.close();
 
-    QDeclarativeJS::Minify minify;
+    QQmlJS::Minify minify;
     if (! minify(fileName, code)) {
         std::cerr << "qmlmin: cannot minify '" << qPrintable(fileName) << "' (not a valid QML/JS file)" << std::endl;
         return EXIT_FAILURE;
@@ -580,13 +580,13 @@ int runQmlmin(int argc, char *argv[])
     //
     // verify the output
     //
-    QDeclarativeJS::Minify secondMinify;
+    QQmlJS::Minify secondMinify;
     if (! secondMinify(fileName, minify.minifiedCode()) || secondMinify.minifiedCode() != minify.minifiedCode()) {
         std::cerr << "qmlmin: cannot minify '" << qPrintable(fileName) << "'" << std::endl;
         return EXIT_FAILURE;
     }
 
-    QDeclarativeJS::Tokenize originalTokens, minimizedTokens;
+    QQmlJS::Tokenize originalTokens, minimizedTokens;
     originalTokens(fileName, code);
     minimizedTokens(fileName, minify.minifiedCode());
 
diff --git a/tools/qmlmin/qmlmin.pro b/tools/qmlmin/qmlmin.pro
index 67c7004c18..c57ec29d5b 100644
--- a/tools/qmlmin/qmlmin.pro
+++ b/tools/qmlmin/qmlmin.pro
@@ -1,7 +1,7 @@
 QT       = core qmldevtools-private
 CONFIG  += console
 CONFIG  -= app_bundle
-DESTDIR  = $$QT.declarative.bins
+DESTDIR  = $$QT.qml.bins
 SOURCES += main.cpp
 
 target.path = $$[QT_INSTALL_BINS]
-- 
cgit v1.2.3