diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-09-21 10:18:15 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-21 06:11:06 +0200 |
commit | 4114b9dcff68cdebc36e3b4818d4463d62421ecf (patch) | |
tree | 4c329843d9713390d6b28212adb9587ed63d5049 /examples/declarative/cppextensions/plugins/plugin.cpp | |
parent | 91a16c3a6db8ac4cfe6779a0b2d95097377dd04f (diff) |
Fixed compile of examples and tests.
6aad4122332c0291e2e3249b508c7583428177b9 in qtbase removed implicit
linking to libQtWidgets. Projects which implicitly used that module
were broken.
Either remove the dependency where it is not required, or explicitly
opt-in to libQtWidgets where it is required.
Change-Id: I6f4fb1d98bdf5bb65b4f02a1d245d334314b163d
Reviewed-on: http://codereview.qt-project.org/5268
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'examples/declarative/cppextensions/plugins/plugin.cpp')
-rw-r--r-- | examples/declarative/cppextensions/plugins/plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative/cppextensions/plugins/plugin.cpp b/examples/declarative/cppextensions/plugins/plugin.cpp index 056e09383b..299b0ff3e7 100644 --- a/examples/declarative/cppextensions/plugins/plugin.cpp +++ b/examples/declarative/cppextensions/plugins/plugin.cpp @@ -43,7 +43,7 @@ #include <qdebug.h> #include <qdatetime.h> #include <qbasictimer.h> -#include <qapplication.h> +#include <qcoreapplication.h> // Implements a "TimeModel" class with hour and minute properties // that change on-the-minute yet efficiently sleep the rest @@ -109,7 +109,7 @@ public: { if (++instances == 1) { if (!timer) - timer = new MinuteTimer(qApp); + timer = new MinuteTimer(QCoreApplication::instance()); connect(timer, SIGNAL(timeChanged()), this, SIGNAL(timeChanged())); timer->start(); } |