From: Aaron Kennedy Date: Tue, 12 Jul 2011 05:22:40 +0000 (+1000) Subject: Move tools classes into their own directory X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=f68290cb245ecddaa720ff6853511259e449e568;p=konrad%2Fqtdeclarative.git Move tools classes into their own directory Change-Id: Ic8a3a35f36259659cb83b5e11641af47bd8b18a9 Reviewed-on: http://codereview.qt.nokia.com/3743 Reviewed-by: Roberto Raggi Reviewed-by: Qt Sanity Bot --- diff --git a/src/declarative/qml/ftw/ftw.pri b/src/declarative/qml/ftw/ftw.pri new file mode 100644 index 0000000..8709363 --- /dev/null +++ b/src/declarative/qml/ftw/ftw.pri @@ -0,0 +1,16 @@ +INCLUDEPATH += $$PWD + +HEADERS += \ + $$PWD/qbitfield_p.h \ + $$PWD/qintrusivelist_p.h \ + $$PWD/qmetaobjectbuilder_p.h \ + $$PWD/qpodvector_p.h \ + $$PWD/qhashedstring_p.h \ + $$PWD/qdeclarativerefcount_p.h \ + +SOURCES += \ + $$PWD/qintrusivelist.cpp \ + $$PWD/qmetaobjectbuilder.cpp \ + $$PWD/qhashedstring.cpp \ + $$PWD/qdeclarativerefcount.cpp \ + diff --git a/src/declarative/qml/qbitfield_p.h b/src/declarative/qml/ftw/qbitfield_p.h similarity index 100% rename from src/declarative/qml/qbitfield_p.h rename to src/declarative/qml/ftw/qbitfield_p.h diff --git a/src/declarative/qml/qdeclarativerefcount.cpp b/src/declarative/qml/ftw/qdeclarativerefcount.cpp similarity index 100% rename from src/declarative/qml/qdeclarativerefcount.cpp rename to src/declarative/qml/ftw/qdeclarativerefcount.cpp diff --git a/src/declarative/qml/qdeclarativerefcount_p.h b/src/declarative/qml/ftw/qdeclarativerefcount_p.h similarity index 100% rename from src/declarative/qml/qdeclarativerefcount_p.h rename to src/declarative/qml/ftw/qdeclarativerefcount_p.h diff --git a/src/declarative/qml/v8/qhashedstring.cpp b/src/declarative/qml/ftw/qhashedstring.cpp similarity index 100% rename from src/declarative/qml/v8/qhashedstring.cpp rename to src/declarative/qml/ftw/qhashedstring.cpp diff --git a/src/declarative/qml/v8/qhashedstring_p.h b/src/declarative/qml/ftw/qhashedstring_p.h similarity index 100% rename from src/declarative/qml/v8/qhashedstring_p.h rename to src/declarative/qml/ftw/qhashedstring_p.h diff --git a/src/declarative/qml/qintrusivelist.cpp b/src/declarative/qml/ftw/qintrusivelist.cpp similarity index 100% rename from src/declarative/qml/qintrusivelist.cpp rename to src/declarative/qml/ftw/qintrusivelist.cpp diff --git a/src/declarative/qml/qintrusivelist_p.h b/src/declarative/qml/ftw/qintrusivelist_p.h similarity index 100% rename from src/declarative/qml/qintrusivelist_p.h rename to src/declarative/qml/ftw/qintrusivelist_p.h diff --git a/src/declarative/qml/qmetaobjectbuilder.cpp b/src/declarative/qml/ftw/qmetaobjectbuilder.cpp similarity index 100% rename from src/declarative/qml/qmetaobjectbuilder.cpp rename to src/declarative/qml/ftw/qmetaobjectbuilder.cpp diff --git a/src/declarative/qml/qmetaobjectbuilder_p.h b/src/declarative/qml/ftw/qmetaobjectbuilder_p.h similarity index 100% rename from src/declarative/qml/qmetaobjectbuilder_p.h rename to src/declarative/qml/ftw/qmetaobjectbuilder_p.h diff --git a/src/declarative/qml/qpodvector_p.h b/src/declarative/qml/ftw/qpodvector_p.h similarity index 100% rename from src/declarative/qml/qpodvector_p.h rename to src/declarative/qml/ftw/qpodvector_p.h diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index 18d59f7..b73c141 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -17,7 +17,6 @@ SOURCES += \ $$PWD/qdeclarativecompiler.cpp \ $$PWD/qdeclarativecompileddata.cpp \ $$PWD/qdeclarativeboundsignal.cpp \ - $$PWD/qdeclarativerefcount.cpp \ $$PWD/qdeclarativemetatype.cpp \ $$PWD/qdeclarativestringconverters.cpp \ $$PWD/qdeclarativeparserstatus.cpp \ @@ -31,7 +30,6 @@ SOURCES += \ $$PWD/qdeclarativefastproperties.cpp \ $$PWD/qdeclarativexmlhttprequest.cpp \ $$PWD/qdeclarativesqldatabase.cpp \ - $$PWD/qmetaobjectbuilder.cpp \ $$PWD/qdeclarativewatcher.cpp \ $$PWD/qdeclarativecleanup.cpp \ $$PWD/qdeclarativepropertycache.cpp \ @@ -47,7 +45,6 @@ SOURCES += \ $$PWD/qdeclarativeextensionplugin.cpp \ $$PWD/qdeclarativeimport.cpp \ $$PWD/qdeclarativelist.cpp \ - $$PWD/qintrusivelist.cpp \ HEADERS += \ $$PWD/qdeclarativeparser_p.h \ @@ -72,7 +69,6 @@ HEADERS += \ $$PWD/qdeclarativeengine_p.h \ $$PWD/qdeclarativeexpression_p.h \ $$PWD/qdeclarativeprivate.h \ - $$PWD/qdeclarativerefcount_p.h \ $$PWD/qdeclarativemetatype_p.h \ $$PWD/qdeclarativeengine.h \ $$PWD/qdeclarativecontext.h \ @@ -89,13 +85,10 @@ HEADERS += \ $$PWD/qdeclarativescriptparser_p.h \ $$PWD/qdeclarativeenginedebug_p.h \ $$PWD/qdeclarativerewrite_p.h \ - $$PWD/qpodvector_p.h \ - $$PWD/qbitfield_p.h \ $$PWD/qdeclarativevaluetype_p.h \ $$PWD/qdeclarativefastproperties_p.h \ $$PWD/qdeclarativexmlhttprequest_p.h \ $$PWD/qdeclarativesqldatabase_p.h \ - $$PWD/qmetaobjectbuilder_p.h \ $$PWD/qdeclarativewatcher_p.h \ $$PWD/qdeclarativecleanup_p.h \ $$PWD/qdeclarativepropertycache_p.h \ @@ -113,11 +106,11 @@ HEADERS += \ $$PWD/qdeclarativeimport_p.h \ $$PWD/qdeclarativeextensionplugin.h \ $$PWD/qdeclarativenullablevalue_p_p.h \ - $$PWD/qintrusivelist_p.h \ $$PWD/qdeclarativescriptstring_p.h QT += sql include(parser/parser.pri) include(rewriter/rewriter.pri) +include(ftw/ftw.pri) include(v4/v4.pri) include(v8/v8.pri) diff --git a/src/declarative/qml/v8/v8.pri b/src/declarative/qml/v8/v8.pri index 9349742..175efd6 100644 --- a/src/declarative/qml/v8/v8.pri +++ b/src/declarative/qml/v8/v8.pri @@ -8,7 +8,6 @@ HEADERS += \ $$PWD/qv8debug_p.h \ $$PWD/qv8stringwrapper_p.h \ $$PWD/qv8engine_p.h \ - $$PWD/qhashedstring_p.h \ $$PWD/qv8contextwrapper_p.h \ $$PWD/qv8qobjectwrapper_p.h \ $$PWD/qv8typewrapper_p.h \ @@ -25,7 +24,6 @@ HEADERS += \ SOURCES += \ $$PWD/qv8stringwrapper.cpp \ $$PWD/qv8engine.cpp \ - $$PWD/qhashedstring.cpp \ $$PWD/qv8contextwrapper.cpp \ $$PWD/qv8qobjectwrapper.cpp \ $$PWD/qv8typewrapper.cpp \