diff options
-rw-r--r-- | src/declarative/util/qdeclarativeconnections.cpp (renamed from src/declarative/util/qdeclarativeconnection.cpp) | 2 | ||||
-rw-r--r-- | src/declarative/util/qdeclarativeconnections_p.h (renamed from src/declarative/util/qdeclarativeconnection_p.h) | 0 | ||||
-rw-r--r-- | src/declarative/util/qdeclarativeutilmodule.cpp | 2 | ||||
-rw-r--r-- | src/declarative/util/util.pri | 4 | ||||
-rw-r--r-- | tests/auto/declarative/declarative.pro | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeconnections/data/test-connection.qml (renamed from tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeconnections/data/test-connection2.qml (renamed from tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeconnections/data/test-connection3.qml (renamed from tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeconnections/data/trimming.qml (renamed from tests/auto/declarative/qdeclarativeconnection/data/trimming.qml) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeconnections/qdeclarativeconnection.pro (renamed from tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeconnections/tst_qdeclarativeconnection.cpp (renamed from tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp) | 0 |
11 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/util/qdeclarativeconnection.cpp b/src/declarative/util/qdeclarativeconnections.cpp index a180509..0b9e3ab 100644 --- a/src/declarative/util/qdeclarativeconnection.cpp +++ b/src/declarative/util/qdeclarativeconnections.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativeconnection_p.h" +#include "qdeclarativeconnections_p.h" #include <qdeclarativeexpression.h> #include <qdeclarativeproperty_p.h> diff --git a/src/declarative/util/qdeclarativeconnection_p.h b/src/declarative/util/qdeclarativeconnections_p.h index 3eacf12..3eacf12 100644 --- a/src/declarative/util/qdeclarativeconnection_p.h +++ b/src/declarative/util/qdeclarativeconnections_p.h diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp index 3d34e33..2b8c7de 100644 --- a/src/declarative/util/qdeclarativeutilmodule.cpp +++ b/src/declarative/util/qdeclarativeutilmodule.cpp @@ -45,7 +45,7 @@ #include "qdeclarativeanimation_p_p.h" #include "qdeclarativebehavior_p.h" #include "qdeclarativebind_p.h" -#include "qdeclarativeconnection_p.h" +#include "qdeclarativeconnections_p.h" #include "qdeclarativedatetimeformatter_p.h" #include "qdeclarativeeasefollow_p.h" #include "qdeclarativefontloader_p.h" diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri index 610eb3f..198e9e5 100644 --- a/src/declarative/util/util.pri +++ b/src/declarative/util/util.pri @@ -5,7 +5,7 @@ SOURCES += \ $$PWD/qdeclarativeview.cpp \ $$PWD/qfxperf.cpp \ $$PWD/qperformancelog.cpp \ - $$PWD/qdeclarativeconnection.cpp \ + $$PWD/qdeclarativeconnections.cpp \ $$PWD/qdeclarativepackage.cpp \ $$PWD/qdeclarativeanimation.cpp \ $$PWD/qdeclarativesystempalette.cpp \ @@ -37,7 +37,7 @@ HEADERS += \ $$PWD/qdeclarativeview.h \ $$PWD/qfxperf_p_p.h \ $$PWD/qperformancelog_p_p.h \ - $$PWD/qdeclarativeconnection_p.h \ + $$PWD/qdeclarativeconnections_p.h \ $$PWD/qdeclarativepackage_p.h \ $$PWD/qdeclarativeanimation_p.h \ $$PWD/qdeclarativeanimation_p_p.h \ diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 42ff523..4387875 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -7,7 +7,7 @@ SUBDIRS += \ qdeclarativeanimations \ # Cover qdeclarativebehaviors \ # Cover qdeclarativebinding \ # Cover - qdeclarativeconnection \ # Cover + qdeclarativeconnections \ # Cover qdeclarativecontext \ # Cover qdeclarativedatetimeformatter \ # Cover qdeclarativedebug \ # Cover diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml b/tests/auto/declarative/qdeclarativeconnections/data/test-connection.qml index 81ab599..81ab599 100644 --- a/tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml +++ b/tests/auto/declarative/qdeclarativeconnections/data/test-connection.qml diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml b/tests/auto/declarative/qdeclarativeconnections/data/test-connection2.qml index 22e9422..22e9422 100644 --- a/tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml +++ b/tests/auto/declarative/qdeclarativeconnections/data/test-connection2.qml diff --git a/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml b/tests/auto/declarative/qdeclarativeconnections/data/test-connection3.qml index 6e396c0..6e396c0 100644 --- a/tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml +++ b/tests/auto/declarative/qdeclarativeconnections/data/test-connection3.qml diff --git a/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml b/tests/auto/declarative/qdeclarativeconnections/data/trimming.qml index 736d5e8..736d5e8 100644 --- a/tests/auto/declarative/qdeclarativeconnection/data/trimming.qml +++ b/tests/auto/declarative/qdeclarativeconnections/data/trimming.qml diff --git a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnections/qdeclarativeconnection.pro index a6adfa4..a6adfa4 100644 --- a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro +++ b/tests/auto/declarative/qdeclarativeconnections/qdeclarativeconnection.pro diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnections/tst_qdeclarativeconnection.cpp index f10217c..f10217c 100644 --- a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp +++ b/tests/auto/declarative/qdeclarativeconnections/tst_qdeclarativeconnection.cpp |