diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-10-20 11:22:44 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-10-20 11:23:27 +0200 |
| commit | 9cec4512935d80dbce2bce536cd7ddd9947b630a (patch) | |
| tree | 2da5e1d2f8ceab2c99bfde73006bcb43bee69fa6 | |
| parent | 2cc087c7c1a0194b912f6cb7eb75467451d5a618 (diff) | |
| parent | 3536ee033c9eb14f7b28ca3c36345118aeb39166 (diff) | |
| download | qtactiveqt-9cec4512935d80dbce2bce536cd7ddd9947b630a.tar.gz | |
Merge remote-tracking branch 'gerrit/5.4' into dev
Change-Id: I9c2d50304f8f12e8e609929c90332ae405020b62
| -rw-r--r-- | examples/activeqt/webbrowser/main.cpp | 5 | ||||
| -rw-r--r-- | qtactiveqt.pro | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/examples/activeqt/webbrowser/main.cpp b/examples/activeqt/webbrowser/main.cpp index 390bf6f..3e61f37 100644 --- a/examples/activeqt/webbrowser/main.cpp +++ b/examples/activeqt/webbrowser/main.cpp @@ -46,7 +46,6 @@ #include <QStatusBar> #include <QMainWindow> #include <QDesktopWidget> -#include <QVersionNumber> #include <QAbstractEventDispatcher> #include <QSignalMapper> #include <QVariant> @@ -192,9 +191,9 @@ MainWindow::MainWindow() resize(size); move(availableGeometry.center() - QPoint(size.width(), size.height()) / 2); } - QVersionNumber restoredVersion = QVersionNumber::fromString(settings.value(QLatin1String(versionKey)).toString()); + const QString restoredVersion = settings.value(QLatin1String(versionKey)).toString(); QList<Location> bookmarks = readBookMarks(settings); - if (bookmarks.isEmpty() || restoredVersion.isNull()) + if (bookmarks.isEmpty() || restoredVersion.isEmpty()) bookmarks = defaultBookmarks(); foreach (const Location &bookmark, bookmarks) addBookmark(bookmark); diff --git a/qtactiveqt.pro b/qtactiveqt.pro index 0e9e462..039aaad 100644 --- a/qtactiveqt.pro +++ b/qtactiveqt.pro @@ -1,7 +1,7 @@ CONFIG += tests_need_tools load(qt_parts) -!win32|winrt { +!win32|winrt|wince { message("ActiveQt is a Windows Desktop-only module. Will just generate a docs target.") SUBDIRS = src } |