From 309cdc358ec646090a1e5809c3817df8af1f531f Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 10 Dec 2011 02:22:06 +0100 Subject: [PATCH] Move QAbstractItemModel into a separate directory. Change-Id: Ib505520dd5b52743634befbf3f148d7f8c21ec44 Reviewed-by: Thiago Macieira --- src/corelib/corelib.pro | 1 + src/corelib/itemmodels/itemmodels.pri | 8 ++++++++ src/corelib/{kernel => itemmodels}/qabstractitemmodel.cpp | 0 src/corelib/{kernel => itemmodels}/qabstractitemmodel.h | 0 src/corelib/{kernel => itemmodels}/qabstractitemmodel_p.h | 0 src/corelib/kernel/kernel.pri | 3 --- tests/auto/corelib/corelib.pro | 1 + tests/auto/corelib/itemmodels/itemmodels.pro | 5 +++++ .../{kernel => itemmodels}/qabstractitemmodel/.gitignore | 0 .../qabstractitemmodel/qabstractitemmodel.pro | 0 .../qabstractitemmodel/tst_qabstractitemmodel.cpp | 0 tests/auto/corelib/kernel/kernel.pro | 2 -- 12 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 src/corelib/itemmodels/itemmodels.pri rename src/corelib/{kernel => itemmodels}/qabstractitemmodel.cpp (100%) rename src/corelib/{kernel => itemmodels}/qabstractitemmodel.h (100%) rename src/corelib/{kernel => itemmodels}/qabstractitemmodel_p.h (100%) create mode 100644 tests/auto/corelib/itemmodels/itemmodels.pro rename tests/auto/corelib/{kernel => itemmodels}/qabstractitemmodel/.gitignore (100%) rename tests/auto/corelib/{kernel => itemmodels}/qabstractitemmodel/qabstractitemmodel.pro (100%) rename tests/auto/corelib/{kernel => itemmodels}/qabstractitemmodel/tst_qabstractitemmodel.cpp (100%) diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index edb5ecb849..17c15d42b1 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -23,6 +23,7 @@ include(global/global.pri) include(thread/thread.pri) include(tools/tools.pri) include(io/io.pri) +include(itemmodels/itemmodels.pri) include(plugin/plugin.pri) include(kernel/kernel.pri) include(codecs/codecs.pri) diff --git a/src/corelib/itemmodels/itemmodels.pri b/src/corelib/itemmodels/itemmodels.pri new file mode 100644 index 0000000000..618c748612 --- /dev/null +++ b/src/corelib/itemmodels/itemmodels.pri @@ -0,0 +1,8 @@ +# Qt itemmodels core module + +HEADERS += \ + itemmodels/qabstractitemmodel.h \ + itemmodels/qabstractitemmodel_p.h + +SOURCES += \ + itemmodels/qabstractitemmodel.cpp diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp similarity index 100% rename from src/corelib/kernel/qabstractitemmodel.cpp rename to src/corelib/itemmodels/qabstractitemmodel.cpp diff --git a/src/corelib/kernel/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h similarity index 100% rename from src/corelib/kernel/qabstractitemmodel.h rename to src/corelib/itemmodels/qabstractitemmodel.h diff --git a/src/corelib/kernel/qabstractitemmodel_p.h b/src/corelib/itemmodels/qabstractitemmodel_p.h similarity index 100% rename from src/corelib/kernel/qabstractitemmodel_p.h rename to src/corelib/itemmodels/qabstractitemmodel_p.h diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index 8b69d771b7..b67d60bfff 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -2,8 +2,6 @@ HEADERS += \ kernel/qabstracteventdispatcher.h \ - kernel/qabstractitemmodel.h \ - kernel/qabstractitemmodel_p.h \ kernel/qbasictimer.h \ kernel/qeventloop.h\ kernel/qpointer.h \ @@ -42,7 +40,6 @@ HEADERS += \ SOURCES += \ kernel/qabstracteventdispatcher.cpp \ - kernel/qabstractitemmodel.cpp \ kernel/qbasictimer.cpp \ kernel/qeventloop.cpp \ kernel/qcoreapplication.cpp \ diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro index 50228990c9..84eb3f284c 100644 --- a/tests/auto/corelib/corelib.pro +++ b/tests/auto/corelib/corelib.pro @@ -5,6 +5,7 @@ SUBDIRS=\ concurrent \ global \ io \ + itemmodels \ kernel \ plugin \ statemachine \ diff --git a/tests/auto/corelib/itemmodels/itemmodels.pro b/tests/auto/corelib/itemmodels/itemmodels.pro new file mode 100644 index 0000000000..c11a1f120b --- /dev/null +++ b/tests/auto/corelib/itemmodels/itemmodels.pro @@ -0,0 +1,5 @@ +TEMPLATE=subdirs + +SUBDIRS = qabstractitemmodel + +mac: qabstractitemmodel.CONFIG = no_check_target # QTBUG-22748 diff --git a/tests/auto/corelib/kernel/qabstractitemmodel/.gitignore b/tests/auto/corelib/itemmodels/qabstractitemmodel/.gitignore similarity index 100% rename from tests/auto/corelib/kernel/qabstractitemmodel/.gitignore rename to tests/auto/corelib/itemmodels/qabstractitemmodel/.gitignore diff --git a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro similarity index 100% rename from tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro rename to tests/auto/corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro diff --git a/tests/auto/corelib/kernel/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp similarity index 100% rename from tests/auto/corelib/kernel/qabstractitemmodel/tst_qabstractitemmodel.cpp rename to tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp diff --git a/tests/auto/corelib/kernel/kernel.pro b/tests/auto/corelib/kernel/kernel.pro index 90a5c24506..77762dbee1 100644 --- a/tests/auto/corelib/kernel/kernel.pro +++ b/tests/auto/corelib/kernel/kernel.pro @@ -1,6 +1,5 @@ TEMPLATE=subdirs SUBDIRS=\ - qabstractitemmodel \ qcoreapplication \ qeventloop \ qitemmodel \ @@ -24,4 +23,3 @@ SUBDIRS=\ # This test is only applicable on Windows !win32*:SUBDIRS -= qwineventnotifier -mac: qabstractitemmodel.CONFIG = no_check_target # QTBUG-22748