summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2011-12-10 02:22:06 +0100
committerQt by Nokia <qt-info@nokia.com>2011-12-13 02:23:42 +0100
commit309cdc358ec646090a1e5809c3817df8af1f531f (patch)
tree3f99b1854d7888b8eb39db2e41230d7bdc5b09d9
parent4465fdd1668da3c58df2a06cfe4d9d9aa7f66684 (diff)
Move QAbstractItemModel into a separate directory.
Change-Id: Ib505520dd5b52743634befbf3f148d7f8c21ec44 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r--src/corelib/corelib.pro1
-rw-r--r--src/corelib/itemmodels/itemmodels.pri8
-rw-r--r--src/corelib/itemmodels/qabstractitemmodel.cpp (renamed from src/corelib/kernel/qabstractitemmodel.cpp)0
-rw-r--r--src/corelib/itemmodels/qabstractitemmodel.h (renamed from src/corelib/kernel/qabstractitemmodel.h)0
-rw-r--r--src/corelib/itemmodels/qabstractitemmodel_p.h (renamed from src/corelib/kernel/qabstractitemmodel_p.h)0
-rw-r--r--src/corelib/kernel/kernel.pri3
-rw-r--r--tests/auto/corelib/corelib.pro1
-rw-r--r--tests/auto/corelib/itemmodels/itemmodels.pro5
-rw-r--r--tests/auto/corelib/itemmodels/qabstractitemmodel/.gitignore (renamed from tests/auto/corelib/kernel/qabstractitemmodel/.gitignore)0
-rw-r--r--tests/auto/corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro (renamed from tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro)0
-rw-r--r--tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp (renamed from tests/auto/corelib/kernel/qabstractitemmodel/tst_qabstractitemmodel.cpp)0
-rw-r--r--tests/auto/corelib/kernel/kernel.pro2
12 files changed, 15 insertions, 5 deletions
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
index 99455371ae..99455371ae 100644
--- a/src/corelib/kernel/qabstractitemmodel.cpp
+++ b/src/corelib/itemmodels/qabstractitemmodel.cpp
diff --git a/src/corelib/kernel/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h
index 0aa8144602..0aa8144602 100644
--- a/src/corelib/kernel/qabstractitemmodel.h
+++ b/src/corelib/itemmodels/qabstractitemmodel.h
diff --git a/src/corelib/kernel/qabstractitemmodel_p.h b/src/corelib/itemmodels/qabstractitemmodel_p.h
index 86680dd0bc..86680dd0bc 100644
--- a/src/corelib/kernel/qabstractitemmodel_p.h
+++ b/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
index f6f93f4b89..f6f93f4b89 100644
--- a/tests/auto/corelib/kernel/qabstractitemmodel/.gitignore
+++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/.gitignore
diff --git a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro
index acf74737a8..acf74737a8 100644
--- a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro
+++ b/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
index 2340c86207..2340c86207 100644
--- a/tests/auto/corelib/kernel/qabstractitemmodel/tst_qabstractitemmodel.cpp
+++ b/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