diff options
| -rw-r--r-- | qtwinextras.pro | 2 | ||||
| -rw-r--r-- | src/src.pro | 1 | ||||
| -rw-r--r-- | src/winextras/doc/qtwinextras.qdocconf | 3 | ||||
| -rw-r--r-- | src/winextras/doc/snippets/code/jumplist.cpp | 11 | ||||
| -rw-r--r-- | src/winextras/qwinfunctions_p.h | 4 |
5 files changed, 9 insertions, 12 deletions
diff --git a/qtwinextras.pro b/qtwinextras.pro index 7afe1e3..62840da 100644 --- a/qtwinextras.pro +++ b/qtwinextras.pro @@ -1,3 +1,3 @@ -requires(!winrt:!wince) +requires(!winrt) load(qt_parts) diff --git a/src/src.pro b/src/src.pro index 5d8fdba..fceeb21 100644 --- a/src/src.pro +++ b/src/src.pro @@ -6,5 +6,6 @@ win32 { } else { # fake project for creating the documentation TEMPLATE = aux + CONFIG += force_qt QMAKE_DOCS = $$PWD/winextras/doc/qtwinextras.qdocconf } diff --git a/src/winextras/doc/qtwinextras.qdocconf b/src/winextras/doc/qtwinextras.qdocconf index 56262e5..c6238f2 100644 --- a/src/winextras/doc/qtwinextras.qdocconf +++ b/src/winextras/doc/qtwinextras.qdocconf @@ -12,8 +12,7 @@ examplesinstallpath = winextras moduleheader = QtWinExtrasDoc includepaths = -I . \ - -I .. \ - -I $QT_INSTALL_HEADERS + -I .. headerdirs = .. ../../imports/winextras sourcedirs = .. ../../imports/winextras diff --git a/src/winextras/doc/snippets/code/jumplist.cpp b/src/winextras/doc/snippets/code/jumplist.cpp index 2527528..6f8221e 100644 --- a/src/winextras/doc/snippets/code/jumplist.cpp +++ b/src/winextras/doc/snippets/code/jumplist.cpp @@ -54,19 +54,16 @@ void foo() { //! [jumplist] QWinJumpList jumplist; - jumplist.begin(); - jumplist.setKnownCategoryShown(QWinJumpList::RecentCategory); - - jumplist.beginTasks(); + QWinJumpListCategory *tasks = jumplist.tasks(); QWinJumpListItem *newProject = new QWinJumpListItem(QWinJumpListItem::Link); newProject->setTitle(tr("Create new project")); newProject->setFilePath(QDir::toNativeSeparators(QCoreApplication::applicationFilePath())); newProject->setArguments(QStringList("--new-project")); - jumplist.addItem(newProject); + tasks->addItem(newProject); - jumplist.addLink(tr("Launch SDK Manager"), QDir::toNativeSeparators(QCoreApplication::applicationDirPath()) + "\\sdk-manager.exe"); + tasks->addLink(tr("Launch SDK Manager"), QDir::toNativeSeparators(QCoreApplication::applicationDirPath()) + "\\sdk-manager.exe"); - jumplist.commit(); + tasks->setVisible(true); //! [jumplist] } diff --git a/src/winextras/qwinfunctions_p.h b/src/winextras/qwinfunctions_p.h index 3aad7bc..03dff5e 100644 --- a/src/winextras/qwinfunctions_p.h +++ b/src/winextras/qwinfunctions_p.h @@ -69,10 +69,10 @@ namespace QtDwmApiDll template <class T> static T windowAttribute(HWND hwnd, DWORD attribute, T defaultValue); template <class T> static void setWindowAttribute(HWND hwnd, DWORD attribute, T value); - static bool booleanWindowAttribute(HWND hwnd, DWORD attribute) + inline bool booleanWindowAttribute(HWND hwnd, DWORD attribute) { return QtDwmApiDll::windowAttribute<BOOL>(hwnd, attribute, FALSE) != FALSE; } - static void setBooleanWindowAttribute(HWND hwnd, DWORD attribute, bool value) + inline void setBooleanWindowAttribute(HWND hwnd, DWORD attribute, bool value) { setWindowAttribute<BOOL>(hwnd, attribute, BOOL(value ? TRUE : FALSE)); } }; |