Move QAbstractItemModel into a separate directory.

Change-Id: Ib505520dd5b52743634befbf3f148d7f8c21ec44
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index edb5ecb..17c15d4 100644 (file)
--- 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 (file)
index 0000000..618c748
--- /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 8b69d77..b67d60b 100644 (file)
--- 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 5022899..84eb3f2 100644 (file)
--- 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 (file)
index 0000000..c11a1f1
--- /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 90a5c24..77762db 100644 (file)
--- 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