AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Merge remote-tracking branch 'origin/5.4.0' into 5.4" into refs/staging/5.4

Browse Source
This commit is contained in:
Simon Hausmann 2014-12-05 15:00:41 +01:00 committed by The Qt Project
commit 8c0014213b
33 changed files with 2755 additions and 1232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -4650,8 +4650,8 @@ if [ "$CFG_DBUS" != "no" ]; then
fi fi
QMakeVar set QT_HOST_CFLAGS_DBUS "$QT_CFLAGS_DBUS" QMakeVar set QT_HOST_CFLAGS_DBUS "$QT_CFLAGS_DBUS"
else else
if [ "$CFG_DBUS" = "auto" ]; then if [ "$CFG_DBUS" != "linked" ]; then
CFG_DBUS=no CFG_DBUS=runtime
elif [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then elif [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
# CFG_DBUS is "yes" or "linked" here # CFG_DBUS is "yes" or "linked" here

3
dist/changes-5.4.0 vendored
View File

@ -404,7 +404,8 @@ Android
- [QTBUG-41817] QClipboard::mimeData() now returns an empty object instead - [QTBUG-41817] QClipboard::mimeData() now returns an empty object instead
of null pointer from QClipboard when clipboard is empty for consistency of null pointer from QClipboard when clipboard is empty for consistency
with other platforms. with other platforms.
- New bearer plugin. It's now possible to get more information about the
different network configurations on Android.
- Important Behavior Changes: - Important Behavior Changes:
* [QTBUG-36274] The main event loop is now stopped when the app is * [QTBUG-36274] The main event loop is now stopped when the app is
suspended suspended

3
doc/global/config.qdocconf
View File

@ -9,8 +9,7 @@ dita.metadata.default.audience = programmer
#Set the main Qt index.html #Set the main Qt index.html
navigation.homepage = "Qt $QT_VER" navigation.homepage = "Qt $QT_VER"
buildversion = "Qt $QT_VERSION Reference Documentation"
sourcedirs += includes sourcedirs += includes
url = http://qt-project.org/doc/qt-5 url = http://doc.qt.io/qt-5

18
doc/global/externalsites/qch-urls.qdoc
View File

@ -38,7 +38,7 @@
\title external: Publishing Applications to Ovi Store \title external: Publishing Applications to Ovi Store
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator \externalpage http://doc.qt.io/qtcreator
\title external: Qt Creator Manual \title external: Qt Creator Manual
*/ */
/*! /*!
@ -50,31 +50,31 @@
\title external: Qt Mobility QML Plugins \title external: Qt Mobility QML Plugins
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-project-managing.html \externalpage http://doc.qt.io/qtcreator/creator-project-managing.html
\title external: Creating Qt Projects in Creator \title external: Creating Qt Projects in Creator
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-building-running.html \externalpage http://doc.qt.io/qtcreator/creator-building-running.html
\title external: Building and Running Applications in Creator \title external: Building and Running Applications in Creator
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-running-targets.html \externalpage http://doc.qt.io/qtcreator/creator-running-targets.html
\title external: Set Compiler Targets in Creator \title external: Set Compiler Targets in Creator
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-build-settings.html \externalpage http://doc.qt.io/qtcreator/creator-build-settings.html
\title external: Build Settings in Creator \title external: Build Settings in Creator
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-run-settings.html \externalpage http://doc.qt.io/qtcreator/creator-run-settings.html
\title external: Run Settings in Creator \title external: Run Settings in Creator
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-using-qt-designer.html \externalpage http://doc.qt.io/qtcreator/creator-using-qt-designer.html
\title external: Designer in Creator \title external: Designer in Creator
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-debugging.html \externalpage http://doc.qt.io/qtcreator/creator-debugging.html
\title external: Debugging Applications in Creator \title external: Debugging Applications in Creator
*/ */
/*! /*!
@ -90,6 +90,6 @@
\title external: Qt Mobility Examples \title external: Qt Mobility Examples
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-overview.html \externalpage http://doc.qt.io/qtcreator/creator-overview.html
\title external: Qt Creator Overview \title external: Qt Creator Overview
*/ */

234
doc/global/externalsites/qtcreator.qdoc
View File

@ -26,472 +26,472 @@
****************************************************************************/ ****************************************************************************/
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-deployment-qnx.html \externalpage http://doc.qt.io/qtcreator/creator-deployment-qnx.html
\title Qt Creator: Deploying Applications to QNX Devices \title Qt Creator: Deploying Applications to QNX Devices
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-developing-baremetal.html \externalpage http://doc.qt.io/qtcreator/creator-developing-baremetal.html
\title Qt Creator: Connecting Bare Metal Devices \title Qt Creator: Connecting Bare Metal Devices
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-developing-bb10.html \externalpage http://doc.qt.io/qtcreator/creator-developing-bb10.html
\title Qt Creator: Connecting BlackBerry 10 Devices \title Qt Creator: Connecting BlackBerry 10 Devices
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-developing-qnx.html \externalpage http://doc.qt.io/qtcreator/creator-developing-qnx.html
\title Qt Creator: Connecting QNX Devices \title Qt Creator: Connecting QNX Devices
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-deployment-bb10.html \externalpage http://doc.qt.io/qtcreator/creator-deployment-bb10.html
\title Qt Creator: Deploying Applications to BlackBerry 10 Devices \title Qt Creator: Deploying Applications to BlackBerry 10 Devices
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-developing-generic-linux.html \externalpage http://doc.qt.io/qtcreator/creator-developing-generic-linux.html
\title Qt Creator: Connecting Embedded Linux Devices \title Qt Creator: Connecting Embedded Linux Devices
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-deployment-embedded-linux.html \externalpage http://doc.qt.io/qtcreator/creator-deployment-embedded-linux.html
\title Qt Creator: Deploying Applications to Embedded Linux Devices \title Qt Creator: Deploying Applications to Embedded Linux Devices
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-faq.html \externalpage http://doc.qt.io/qtcreator/creator-faq.html
\title Qt Creator: FAQ \title Qt Creator: FAQ
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-tips.html \externalpage http://doc.qt.io/qtcreator/creator-tips.html
\title Qt Creator: Tips and Tricks \title Qt Creator: Tips and Tricks
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-help.html \externalpage http://doc.qt.io/qtcreator/creator-help.html
\title Qt Creator: Using the Help Mode \title Qt Creator: Using the Help Mode
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-quick-tour.html \externalpage http://doc.qt.io/qtcreator/creator-quick-tour.html
\title Qt Creator: User Interface \title Qt Creator: User Interface
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-cli.html \externalpage http://doc.qt.io/qtcreator/creator-cli.html
\title Qt Creator: Using Command Line Options \title Qt Creator: Using Command Line Options
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-task-lists.html \externalpage http://doc.qt.io/qtcreator/creator-task-lists.html
\title Qt Creator: Showing Task List Files in Issues Pane \title Qt Creator: Showing Task List Files in Issues Pane
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-project-managing-sessions.html \externalpage http://doc.qt.io/qtcreator/creator-project-managing-sessions.html
\title Qt Creator: Managing Sessions \title Qt Creator: Managing Sessions
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-editor-external.html \externalpage http://doc.qt.io/qtcreator/creator-editor-external.html
\title Qt Creator: Using External Tools \title Qt Creator: Using External Tools
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-version-control.html \externalpage http://doc.qt.io/qtcreator/creator-version-control.html
\title Qt Creator: Using Version Control Systems \title Qt Creator: Using Version Control Systems
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-keyboard-shortcuts.html \externalpage http://doc.qt.io/qtcreator/creator-keyboard-shortcuts.html
\title Qt Creator: Keyboard Shortcuts \title Qt Creator: Keyboard Shortcuts
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/quick-screens.html \externalpage http://doc.qt.io/qtcreator/quick-screens.html
\title Qt Creator: Creating Screens \title Qt Creator: Creating Screens
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-qml-application.html \externalpage http://doc.qt.io/qtcreator/creator-qml-application.html
\title Qt Creator: Creating a Qt Quick Application \title Qt Creator: Creating a Qt Quick Application
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/quick-export-to-qml.html \externalpage http://doc.qt.io/qtcreator/quick-export-to-qml.html
\title Qt Creator: Exporting Designs from Graphics Software \title Qt Creator: Exporting Designs from Graphics Software
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-qml-modules-with-plugins.html \externalpage http://doc.qt.io/qtcreator/creator-qml-modules-with-plugins.html
\title Qt Creator: Using QML Modules with Plugins \title Qt Creator: Using QML Modules with Plugins
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-visual-editor.html \externalpage http://doc.qt.io/qtcreator/creator-visual-editor.html
\title Qt Creator: Developing Qt Quick Applications \title Qt Creator: Developing Qt Quick Applications
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-using-qt-quick-designer.html \externalpage http://doc.qt.io/qtcreator/creator-using-qt-quick-designer.html
\title Qt Creator: Using Qt Quick Designer \title Qt Creator: Using Qt Quick Designer
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/quick-projects.html \externalpage http://doc.qt.io/qtcreator/quick-projects.html
\title Qt Creator: Creating Qt Quick Projects \title Qt Creator: Creating Qt Quick Projects
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/quick-components.html \externalpage http://doc.qt.io/qtcreator/quick-components.html
\title Qt Creator: Creating Components \title Qt Creator: Creating Components
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/qt-quick-toolbars.html \externalpage http://doc.qt.io/qtcreator/qt-quick-toolbars.html
\title Qt Creator: Using Qt Quick Toolbars \title Qt Creator: Using Qt Quick Toolbars
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/quick-buttons.html \externalpage http://doc.qt.io/qtcreator/quick-buttons.html
\title Qt Creator: Creating Buttons \title Qt Creator: Creating Buttons
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/quick-scalable-image.html \externalpage http://doc.qt.io/qtcreator/quick-scalable-image.html
\title Qt Creator: Creating Scalable Buttons and Borders \title Qt Creator: Creating Scalable Buttons and Borders
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-editor-options.html \externalpage http://doc.qt.io/qtcreator/creator-editor-options.html
\title Qt Creator: Configuring the Editor \title Qt Creator: Configuring the Editor
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-editor-functions.html \externalpage http://doc.qt.io/qtcreator/creator-editor-functions.html
\title Qt Creator: Writing Code \title Qt Creator: Writing Code
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-coding-navigating.html \externalpage http://doc.qt.io/qtcreator/creator-coding-navigating.html
\title Qt Creator: Working in Edit Mode \title Qt Creator: Working in Edit Mode
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-highlighting.html \externalpage http://doc.qt.io/qtcreator/creator-highlighting.html
\title Qt Creator: Semantic Highlighting \title Qt Creator: Semantic Highlighting
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-checking-code-syntax.html \externalpage http://doc.qt.io/qtcreator/creator-checking-code-syntax.html
\title Qt Creator: Checking Code Syntax \title Qt Creator: Checking Code Syntax
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-completing-code.html \externalpage http://doc.qt.io/qtcreator/creator-completing-code.html
\title Qt Creator: Completing Code \title Qt Creator: Completing Code
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-editor-codepasting.html \externalpage http://doc.qt.io/qtcreator/creator-editor-codepasting.html
\title Qt Creator: Pasting and Fetching Code Snippets \title Qt Creator: Pasting and Fetching Code Snippets
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-macros.html \externalpage http://doc.qt.io/qtcreator/creator-macros.html
\title Qt Creator: Using Text Editing Macros \title Qt Creator: Using Text Editing Macros
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-editor-fakevim.html \externalpage http://doc.qt.io/qtcreator/creator-editor-fakevim.html
\title Qt Creator: Using FakeVim Mode \title Qt Creator: Using FakeVim Mode
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-indenting-code.html \externalpage http://doc.qt.io/qtcreator/creator-indenting-code.html
\title Qt Creator: Indenting Text or Code \title Qt Creator: Indenting Text or Code
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-editor-finding.html \externalpage http://doc.qt.io/qtcreator/creator-editor-finding.html
\title Qt Creator: Finding and Replacing \title Qt Creator: Finding and Replacing
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-editor-refactoring.html \externalpage http://doc.qt.io/qtcreator/creator-editor-refactoring.html
\title Qt Creator: Refactoring \title Qt Creator: Refactoring
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-editor-locator.html \externalpage http://doc.qt.io/qtcreator/creator-editor-locator.html
\title Qt Creator: Searching with the Locator \title Qt Creator: Searching with the Locator
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-coding.html \externalpage http://doc.qt.io/qtcreator/creator-coding.html
\title Qt Creator: Coding \title Qt Creator: Coding
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-editor-options-text.html \externalpage http://doc.qt.io/qtcreator/creator-editor-options-text.html
\title Qt Creator: Specifying Text Editor Settings \title Qt Creator: Specifying Text Editor Settings
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-finding-overview.html \externalpage http://doc.qt.io/qtcreator/creator-finding-overview.html
\title Qt Creator: Finding \title Qt Creator: Finding
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-mime-types.html \externalpage http://doc.qt.io/qtcreator/creator-mime-types.html
\title Qt Creator: Editing MIME Types \title Qt Creator: Editing MIME Types
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-qml-debugging-example.html \externalpage http://doc.qt.io/qtcreator/creator-qml-debugging-example.html
\title Qt Creator: Debugging a Qt Quick Example Application \title Qt Creator: Debugging a Qt Quick Example Application
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-debugging-example.html \externalpage http://doc.qt.io/qtcreator/creator-debugging-example.html
\title Qt Creator: Debugging a C++ Example Application \title Qt Creator: Debugging a C++ Example Application
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-debugger-engines.html \externalpage http://doc.qt.io/qtcreator/creator-debugger-engines.html
\title Qt Creator: Setting Up Debugger \title Qt Creator: Setting Up Debugger
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-debugging-qml.html \externalpage http://doc.qt.io/qtcreator/creator-debugging-qml.html
\title Qt Creator: Debugging Qt Quick Projects \title Qt Creator: Debugging Qt Quick Projects
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-debugging.html \externalpage http://doc.qt.io/qtcreator/creator-debugging.html
\title Qt Creator: Debugging \title Qt Creator: Debugging
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-debugger-operating-modes.html \externalpage http://doc.qt.io/qtcreator/creator-debugger-operating-modes.html
\title Qt Creator: Launching the Debugger \title Qt Creator: Launching the Debugger
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-debug-mode.html \externalpage http://doc.qt.io/qtcreator/creator-debug-mode.html
\title Qt Creator: Interacting with the Debugger \title Qt Creator: Interacting with the Debugger
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-debugging-helpers.html \externalpage http://doc.qt.io/qtcreator/creator-debugging-helpers.html
\title Qt Creator: Using Debugging Helpers \title Qt Creator: Using Debugging Helpers
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-troubleshooting-debugging.html \externalpage http://doc.qt.io/qtcreator/creator-troubleshooting-debugging.html
\title Qt Creator: Troubleshooting Debugger \title Qt Creator: Troubleshooting Debugger
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/index.html \externalpage http://doc.qt.io/qtcreator/index.html
\title Qt Creator Manual \title Qt Creator Manual
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-advanced.html \externalpage http://doc.qt.io/qtcreator/creator-advanced.html
\title Qt Creator: Advanced Use \title Qt Creator: Advanced Use
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-os-supported-platforms.html \externalpage http://doc.qt.io/qtcreator/creator-os-supported-platforms.html
\title Qt Creator: Supported Platforms \title Qt Creator: Supported Platforms
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-connecting-mobile.html \externalpage http://doc.qt.io/qtcreator/creator-connecting-mobile.html
\title Qt Creator: Connecting Mobile Devices \title Qt Creator: Connecting Mobile Devices
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-usability.html \externalpage http://doc.qt.io/qtcreator/creator-usability.html
\title Qt Creator: Optimizing Applications for Mobile Devices \title Qt Creator: Optimizing Applications for Mobile Devices
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-acknowledgements.html \externalpage http://doc.qt.io/qtcreator/creator-acknowledgements.html
\title Qt Creator: Acknowledgements \title Qt Creator: Acknowledgements
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-help-overview.html \externalpage http://doc.qt.io/qtcreator/creator-help-overview.html
\title Qt Creator: Getting Help \title Qt Creator: Getting Help
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/technical-support.html \externalpage http://doc.qt.io/qtcreator/technical-support.html
\title Qt Creator: Technical Support \title Qt Creator: Technical Support
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-overview.html \externalpage http://doc.qt.io/qtcreator/creator-overview.html
\title Qt Creator: IDE Overview \title Qt Creator: IDE Overview
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-testing.html \externalpage http://doc.qt.io/qtcreator/creator-testing.html
\title Qt Creator: Debugging and Analyzing \title Qt Creator: Debugging and Analyzing
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-deployment.html \externalpage http://doc.qt.io/qtcreator/creator-deployment.html
\title Qt Creator: Deploying to Mobile Devices \title Qt Creator: Deploying to Mobile Devices
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-tutorials.html \externalpage http://doc.qt.io/qtcreator/creator-tutorials.html
\title Qt Creator: Tutorials \title Qt Creator: Tutorials
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-known-issues.html \externalpage http://doc.qt.io/qtcreator/creator-known-issues.html
\title Qt Creator: Known Issues \title Qt Creator: Known Issues
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-design-mode.html \externalpage http://doc.qt.io/qtcreator/creator-design-mode.html
\title Qt Creator: Designing User Interfaces \title Qt Creator: Designing User Interfaces
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-publish-ovi.html \externalpage http://doc.qt.io/qtcreator/creator-publish-ovi.html
\title Qt Creator: Publishing \title Qt Creator: Publishing
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-glossary.html \externalpage http://doc.qt.io/qtcreator/creator-glossary.html
\title Qt Creator: Glossary \title Qt Creator: Glossary
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-getting-started.html \externalpage http://doc.qt.io/qtcreator/creator-getting-started.html
\title Qt Creator: Getting Started \title Qt Creator: Getting Started
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-analyzer.html \externalpage http://doc.qt.io/qtcreator/creator-analyzer.html
\title Qt Creator: Detecting Memory Leaks \title Qt Creator: Detecting Memory Leaks
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-cache-profiler.html \externalpage http://doc.qt.io/qtcreator/creator-cache-profiler.html
\title Qt Creator: Profiling Function Execution \title Qt Creator: Profiling Function Execution
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-running-valgrind-remotely.html \externalpage http://doc.qt.io/qtcreator/creator-running-valgrind-remotely.html
\title Qt Creator: Running Valgrind Tools Remotely \title Qt Creator: Running Valgrind Tools Remotely
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-valgrind-overview.html \externalpage http://doc.qt.io/qtcreator/creator-valgrind-overview.html
\title Qt Creator: Using Valgrind Code Analysis Tools \title Qt Creator: Using Valgrind Code Analysis Tools
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-analyze-mode.html \externalpage http://doc.qt.io/qtcreator/creator-analyze-mode.html
\title Qt Creator: Analyzing Code \title Qt Creator: Analyzing Code
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-qml-performance-monitor.html \externalpage http://doc.qt.io/qtcreator/creator-qml-performance-monitor.html
\title Qt Creator: Profiling QML Applications \title Qt Creator: Profiling QML Applications
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-deploying-android.html \externalpage http://doc.qt.io/qtcreator/creator-deploying-android.html
\title Qt Creator: Deploying Applications to Android Devices \title Qt Creator: Deploying Applications to Android Devices
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-developing-ios.html \externalpage http://doc.qt.io/qtcreator/creator-developing-ios.html
\title Qt Creator: Connecting iOS devices \title Qt Creator: Connecting iOS devices
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-developing-android.html \externalpage http://doc.qt.io/qtcreator/creator-developing-android.html
\title Qt Creator: Connecting Android Devices \title Qt Creator: Connecting Android Devices
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-build-example-application.html \externalpage http://doc.qt.io/qtcreator/creator-build-example-application.html
\title Qt Creator: Building and Running an Example \title Qt Creator: Building and Running an Example
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-project-generic.html \externalpage http://doc.qt.io/qtcreator/creator-project-generic.html
\title Qt Creator: Setting Up a Generic Project \title Qt Creator: Setting Up a Generic Project
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-sharing-project-settings.html \externalpage http://doc.qt.io/qtcreator/creator-sharing-project-settings.html
\title Qt Creator: Sharing Project Settings \title Qt Creator: Sharing Project Settings
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-project-opening.html \externalpage http://doc.qt.io/qtcreator/creator-project-opening.html
\title Qt Creator: Opening Projects \title Qt Creator: Opening Projects
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-project-managing.html \externalpage http://doc.qt.io/qtcreator/creator-project-managing.html
\title Qt Creator: Managing Projects \title Qt Creator: Managing Projects
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-project-cmake.html \externalpage http://doc.qt.io/qtcreator/creator-project-cmake.html
\title Qt Creator: Setting Up a CMake Project \title Qt Creator: Setting Up a CMake Project
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-targets.html \externalpage http://doc.qt.io/qtcreator/creator-targets.html
\title Qt Creator: Adding Kits \title Qt Creator: Adding Kits
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-tool-chains.html \externalpage http://doc.qt.io/qtcreator/creator-tool-chains.html
\title Qt Creator: Adding Compilers \title Qt Creator: Adding Compilers
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-project-qbs.html \externalpage http://doc.qt.io/qtcreator/creator-project-qbs.html
\title Qt Creator: Setting Up a Qbs Project \title Qt Creator: Setting Up a Qbs Project
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-project-creating.html \externalpage http://doc.qt.io/qtcreator/creator-project-creating.html
\title Qt Creator: Creating Projects \title Qt Creator: Creating Projects
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-project-wizards.html \externalpage http://doc.qt.io/qtcreator/creator-project-wizards.html
\title Qt Creator: Adding New Custom Wizards \title Qt Creator: Adding New Custom Wizards
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-projects-autotools.html \externalpage http://doc.qt.io/qtcreator/creator-projects-autotools.html
\title Qt Creator: Setting Up an Autotools Project \title Qt Creator: Setting Up an Autotools Project
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-configuring-projects.html \externalpage http://doc.qt.io/qtcreator/creator-configuring-projects.html
\title Qt Creator: Configuring Projects \title Qt Creator: Configuring Projects
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-build-process-customizing.html \externalpage http://doc.qt.io/qtcreator/creator-build-process-customizing.html
\title Qt Creator: Customizing the Build Process \title Qt Creator: Customizing the Build Process
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-build-settings.html \externalpage http://doc.qt.io/qtcreator/creator-build-settings.html
\title Qt Creator: Specifying Build Settings \title Qt Creator: Specifying Build Settings
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-code-style-settings.html \externalpage http://doc.qt.io/qtcreator/creator-code-style-settings.html
\title Qt Creator: Specifying Code Style Settings \title Qt Creator: Specifying Code Style Settings
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-run-settings.html \externalpage http://doc.qt.io/qtcreator/creator-run-settings.html
\title Qt Creator: Specifying Run Settings \title Qt Creator: Specifying Run Settings
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-project-qmake-libraries.html \externalpage http://doc.qt.io/qtcreator/creator-project-qmake-libraries.html
\title Qt Creator: Adding Libraries to Projects \title Qt Creator: Adding Libraries to Projects
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-project-other.html \externalpage http://doc.qt.io/qtcreator/creator-project-other.html
\title Qt Creator: Using Other Build Systems \title Qt Creator: Using Other Build Systems
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-running-targets.html \externalpage http://doc.qt.io/qtcreator/creator-running-targets.html
\title Qt Creator: Running on Multiple Platforms \title Qt Creator: Running on Multiple Platforms
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-build-dependencies.html \externalpage http://doc.qt.io/qtcreator/creator-build-dependencies.html
\title Qt Creator: Specifying Dependencies \title Qt Creator: Specifying Dependencies
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-building-running.html \externalpage http://doc.qt.io/qtcreator/creator-building-running.html
\title Qt Creator: Building and Running \title Qt Creator: Building and Running
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-editor-settings.html \externalpage http://doc.qt.io/qtcreator/creator-editor-settings.html
\title Qt Creator: Specifying Editor Settings \title Qt Creator: Specifying Editor Settings
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-project-qmake.html \externalpage http://doc.qt.io/qtcreator/creator-project-qmake.html
\title Qt Creator: Adding Qt Versions \title Qt Creator: Adding Qt Versions
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-building-targets.html \externalpage http://doc.qt.io/qtcreator/creator-building-targets.html
\title Qt Creator: Building for Multiple Platforms \title Qt Creator: Building for Multiple Platforms
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-using-qt-designer.html \externalpage http://doc.qt.io/qtcreator/creator-using-qt-designer.html
\title Qt Creator: Developing Widget Based Applications \title Qt Creator: Developing Widget Based Applications
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-writing-program.html \externalpage http://doc.qt.io/qtcreator/creator-writing-program.html
\title Qt Creator: Creating a Qt Widget Based Application \title Qt Creator: Creating a Qt Widget Based Application
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/adding-plugins.html \externalpage http://doc.qt.io/qtcreator/adding-plugins.html
\title Qt Creator: Adding Qt Designer Plugins \title Qt Creator: Adding Qt Designer Plugins
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-configuring.html \externalpage http://doc.qt.io/qtcreator/creator-configuring.html
\title Qt Creator: Configuring Qt Creator \title Qt Creator: Configuring Qt Creator
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-debuggers.html \externalpage http://doc.qt.io/qtcreator/creator-debuggers.html
\title Qt Creator: Adding Debuggers \title Qt Creator: Adding Debuggers
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-mobile-app-tutorial.html \externalpage http://doc.qt.io/qtcreator/creator-mobile-app-tutorial.html
\title Qt Creator: Creating a Mobile Application \title Qt Creator: Creating a Mobile Application
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-diff-editor.html \externalpage http://doc.qt.io/qtcreator/creator-diff-editor.html
\title Qt Creator: Comparing Files \title Qt Creator: Comparing Files
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-beautifier.html \externalpage http://doc.qt.io/qtcreator/creator-beautifier.html
\title Qt Creator: Beautifying Source Code \title Qt Creator: Beautifying Source Code
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-developing-winrt.html \externalpage http://doc.qt.io/qtcreator/creator-developing-winrt.html
\title Qt Creator: Connecting Windows Runtime Devices \title Qt Creator: Connecting Windows Runtime Devices
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-clang-codemodel.html \externalpage http://doc.qt.io/qtcreator/creator-clang-codemodel.html
\title Qt Creator: Parsing C++ Files \title Qt Creator: Parsing C++ Files
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-quick-ui-forms.html \externalpage http://doc.qt.io/qtcreator/creator-quick-ui-forms.html
\title Qt Creator: Qt Quick UI Forms \title Qt Creator: Qt Quick UI Forms
*/ */
/*! /*!
\externalpage http://qt-project.org/doc/qtcreator/creator-clang-static-analyzer.html \externalpage http://doc.qt.io/qtcreator/creator-clang-static-analyzer.html
\title Qt Creator: Using Clang Static Analyzer \title Qt Creator: Using Clang Static Analyzer
*/ */

2
doc/global/fileextensions.qdocconf
View File

@ -1,4 +1,4 @@
naturallanguage = en_US naturallanguage = en
outputencoding = UTF-8 outputencoding = UTF-8
sourceencoding = UTF-8 sourceencoding = UTF-8

84
doc/global/html-footer-online.qdocconf Normal file
View File

@ -0,0 +1,84 @@
# HTML footer for qt.io
HTML.footer += \
"</div>\n" \
"</div>\n" \
"</div>\n" \
"</div>\n" \
"</div>\n" \
"<div id=\"footer\">\n" \
"<footer id=\"footerbar\">\n" \
" <div class=\"footer-main\">\n" \
" <div class=\"container clearfix\">\n" \
" <nav class=\"footer-nav clearfix\">\n" \
" <div class=\"menu-footer-menu-container\"><ul id=\"menu-footer-menu\" class=\"menu\"><li id=\"menu-item-1350\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children menu-item-1350\"><a href=\"http://qt.io/about-us/\">About us</a>\n" \
"<ul class=\"sub-menu\">\n" \
" <li id=\"menu-item-1353\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1353\"><a href=\"http://qt.io/events/\">Events</a></li>\n" \
" <li id=\"menu-item-1596\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1596\"><a href=\"http://qt.io/news/\">News</a></li>\n" \
" <li id=\"menu-item-1354\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1354\"><a href=\"http://qt.io/resource-center/\">Resource Center</a></li>\n" \
" <li id=\"menu-item-1352\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1352\"><a href=\"http://qt.io/partners/\">Partners</a></li>\n" \
" <li id=\"menu-item-1349\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1349\"><a href=\"http://qt.io/careers/\">Careers</a></li>\n" \
" <li id=\"menu-item-1415\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1415\"><a href=\"http://qt.io/terms-conditions/\">Terms &amp; Conditions</a></li>\n" \
"</ul>\n" \
"</li>\n" \
"<li id=\"menu-item-1355\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children menu-item-1355\"><a href=\"http://qt.io/product/\">Product</a>\n" \
"<ul class=\"sub-menu\">\n" \
" <li id=\"menu-item-1358\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1358\"><a href=\"http://qt.io/qt-framework/\">Qt Framework</a></li>\n" \
" <li id=\"menu-item-1356\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1356\"><a href=\"http://qt.io/qt-features/\">Qt Features</a></li>\n" \
" <li id=\"menu-item-1359\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1359\"><a href=\"http://qt.io/qt-quick/\">Qt Quick</a></li>\n" \
" <li id=\"menu-item-1357\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1357\"><a href=\"http://qt.io/qt-for-device-creation/\">Qt for Device Creation</a></li>\n" \
" <li id=\"menu-item-34\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-34\"><a href=\"http://qt.io/qt-in-use/\">Qt in Use</a></li>\n" \
" <li id=\"menu-item-1366\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1366\"><a href=\"http://showroom.qt-project.org/\">Showroom</a></li>\n" \
"</ul>\n" \
"</li>\n" \
"<li id=\"menu-item-33\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children menu-item-33\"><a href=\"http://qt.io/developers/\">Developers</a>\n" \
"<ul class=\"sub-menu\">\n" \
" <li id=\"menu-item-1365\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1365\"><a href=\"http://qt-project.org/doc/\">Documentation</a></li>\n" \
" <li id=\"menu-item-1364\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1364\"><a href=\"http://qt-project.org/doc/qt-5/qtexamplesandtutorials.html\">Examples &amp; Tutorials</a></li>\n" \
" <li id=\"menu-item-1363\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1363\"><a href=\"http://qt-project.org/doc/qt-5/topics-app-development.html\">Tools</a></li>\n" \
" <li id=\"menu-item-1361\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1361\"><a href=\"http://qt-project.org/wiki\">Wiki</a></li>\n" \
" <li id=\"menu-item-1360\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1360\"><a href=\"http://qt-project.org/forums\">Forums</a></li>\n" \
" <li id=\"menu-item-1362\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1362\"><a href=\"http://qt-project.org/wiki/Qt-Contribution-Guidelines\">Contribute to Qt</a></li>\n" \
"</ul>\n" \
"</li>\n" \
"<li id=\"menu-item-1347\" class=\"menu-item menu-item-type-post_type menu-item-object-page current-menu-ancestor current-menu-parent current_page_parent current_page_ancestor menu-item-has-children menu-item-1347\"><a href=\"http://qt.io/services/\">Services</a>\n" \
"<ul class=\"sub-menu\">\n" \
" <li id=\"menu-item-32\" class=\"menu-item menu-item-type-post_type menu-item-object-page page_item page-item-14 menu-item-32\"><a href=\"http://qt.io/support/\">Support</a></li>\n" \
" <li id=\"menu-item-4028\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-4028\"><a href=\"http://qt.io/services-technology-evaluation/\">Technology Evaluation</a></li>\n" \
" <li id=\"menu-item-4027\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-4027\"><a href=\"http://qt.io/services-proof-of-concept/\">Proof of Concept</a></li>\n" \
" <li id=\"menu-item-4026\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-4026\"><a href=\"http://qt.io/services-design-implementation/\">Design &amp; Implementation</a></li>\n" \
" <li id=\"menu-item-4025\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-4025\"><a href=\"http://qt.io/services-productization/\">Productization</a></li>\n" \
"</ul>\n" \
"</li>\n" \
"<li id=\"menu-item-1403\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children menu-item-1403\"><a href=\"http://qt.io/download/\">Download</a>\n" \
"<ul class=\"sub-menu\">\n" \
" <li id=\"menu-item-1985\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1985\"><a title=\"Professional\" href=\"http://qt.io/buy/\">Professional</a></li>\n" \
" <li id=\"menu-item-3346\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-3346\"><a title=\"Indie Mobile\" href=\"http://qt.io/download-mobile/\">Indie Mobile</a></li>\n" \
" <li id=\"menu-item-1982\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1982\"><a title=\"Enterprise\" href=\"http://qt.io/download-enterprise-step-2/\">Enterprise</a></li>\n" \
" <li id=\"menu-item-3013\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-3013\"><a title=\"Evaluation\" href=\"http://qt.io/download-eval-step-2/\">Evaluation</a></li>\n" \
" <li id=\"menu-item-3343\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-3343\"><a href=\"http://qt.io/download-open-source/\">Community</a></li>\n" \
"</ul>\n" \
"</li>\n" \
"</ul></div></nav>\n" \
"<a href=\"http://digia.com\" target=\"_blank\" class=\"footer-logo retina\" data-icon=\"\">\n" \
" </a>\n" \
" <div class=\"footer-social clearfix\">\n" \
" <div class=\"facebook\">\n" \
" <div class=\"fb-like fb_iframe_widget\" data-href=\"https://www.facebook.com/qtbydigia\" data-layout=\"button_count\" data-action=\"like\" data-show-faces=\"true\" data-share=\"false\" fb-xfbml-state=\"parsed\" fb-iframe-plugin-query=\"action=like&amp;app_id=207346529386114&amp;href=https%3A%2F%2Fwww.facebook.com%2Fqtbydigia&amp;layout=button_count&amp;locale=en_US&amp;sdk=joey&amp;share=false&amp;show_faces=true\" style=\"display: block;\"><iframe style=\"width: 30px; height: 19px; border: 0px;\"></iframe></div>\n" \
" </div>\n" \
" <div class=\"twitter\">\n" \
" <iframe id=\"twitter-widget-0\" scrolling=\"no\" frameborder=\"0\" allowtransparency=\"true\" src=\"http://platform.twitter.com/widgets/follow_button.33b190ea0cba008796487b65df7f6d8e.en.html#_=1414403615717&amp;id=twitter-widget-0&amp;lang=en&amp;screen_name=qtproject&amp;show_count=true&amp;show_screen_name=false&amp;size=m\" class=\"twitter-follow-button twitter-follow-button\" title=\"Twitter Follow Button\" data-twttr-rendered=\"true\" style=\"width: 160px; height: 20px;\"></iframe>\n" \
" </div>\n" \
" </div>\n" \
"</div>\n" \
"</div>\n" \
"<div class=\"disclaimer\">\n" \
"<div class=\"container clearfix no_discs\">\n" \
" <ul id=\"menu-footer-submenu\" class=\"right clearfix\"><li id=\"menu-item-1795\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-1795\"><a title=\"Sign into your account.\" href=\"https://account.qt.io/login\">Sign In</a></li>\n" \
" <li id=\"menu-item-1494\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1494\"><a href=\"http://qt.io/contact-us/\">Contact us</a></li>\n" \
" <li id=\"menu-item-4472\" class=\"menu-item menu-item-type-custom menu-item-object-custom menu-item-4472\"><a href=\"http://www.digia.com\">© 2014 Digia Oyj</a></li>\n" \
" </ul>\n" \
"</div>\n" \
"</div>\n" \
"</footer>\n" \
"</div>\n"

159
doc/global/html-header-online.qdocconf
View File

@ -1,64 +1,149 @@
#HTML Header with Qt Project branding and online links # HTML Header with qt.io branding and online links
HTML.stylesheets = template/style/online.css HTML.stylesheets = template/style/online.css \
template/style/gsc.css \
template/style/list_arrow.png \
template/style/icomoon.eot \
template/style/icomoon.svg \
template/style/icomoon.ttf \
template/style/icomoon.woff \
template/style/doc_search.png
#for including files into the qch file. Relative to the outputdir of a QDoc build. #for including files into the qch file. Relative to the outputdir of a QDoc build.
# $QT_INSTALL_DOCS/qtquick/style/online.css for example qhp.extraFiles += style/online.css \
qhp.extraFiles += style/online.css style/gsc.css \
style/list_arrow.png \
style/icomoon.eot \
style/icomoon.svg \
style/icomoon.ttf \
style/icomoon.woff
HTML.headerstyles = \ HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/online.css\" />\n" " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/online.css\" />\n" \
" <link rel=\"shortcut icon\" href=\"//d3hp9ud7yvwzy0.cloudfront.net/wp-content/themes/oneqt/images/favicon.ico.gzip\" />\n"
HTML.headerscripts = \
" <script type=\"text/javascript\"> wpThemeFolder = \'http://qt.io/wp-content/themes/oneqt\'; </script>\n" \
" <script type=\"text/javascript\" src=\"http://d3hp9ud7yvwzy0.cloudfront.net/wp-content/themes/oneqt/js/combo.js.gzip\"></script>\n" \
" <script type=\"text/javascript\" src=\"scripts/main.js\"></script>\n" \
" <script type=\"text/javascript\" src=\"scripts/extras.js\"></script>\n" \
" <script type=\"text/javascript\">\n" \
" \$(function(){\n" \
" \$(\"#sidebar-content\").load(\"style/qt5-sidebar.html\");\n" \
" });\n" \
" </script>\n" \
" <script type=\"text/javascript\">\n" \
" (function (i, s, o, g, r, a, m) {\n" \
" i[\'GoogleAnalyticsObject\'] = r; i[r] = i[r] || function () {\n" \
" (i[r].q = i[r].q || []).push(arguments)\n" \
" }, i[r].l = 1 * new Date(); a = s.createElement(o),\n" \
" m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)\n" \
" })(window, document, \'script\', \'//www.google-analytics.com/analytics.js\', \'ga\');\n\n" \
" ga(\'create\', \'UA-54043535-2\', \'qt.io\');\n" \
" ga(\'set\', \'forceSSL\', true);\n" \
" ga(\'send\', \'pageview\');\n" \
" </script>\n"
HTML.scripts = template/scripts/extras.js \
template/scripts/main.js
HTML.endheader = \ HTML.endheader = \
"</head>\n" "</head>\n"
# minimal header
HTML.postheader = \ HTML.postheader = \
"<body>\n" \ "<body>\n" \
"<div class=\"header\" id=\"qtdocheader\"></div>\n" \ "<div class=\"header\" id=\"header\">\n" \
" <div class=\"nav\" id=\"qt13a-header\">\n" \ "<header id=\"navbar\" class=\"\">\n" \
" <div class=\"qt13a-gradient\">\n" \ " <div class=\"cookies_yum\">\n" \
" <div class=\"qt13a-container qt13a-dynamicREMOVE\" >\n" \ " <div>\n" \
" <div id=\"qt13a-register\">\n" \ " <img src=\"http://qt.io/wp-content/themes/oneqt/assets/images/cookie_small.png\" align=\"left\">\n" \
" <a href=\"http://qt-project.org/\">Qt Home</a>\n" \ " <p class=\"close_button\">\n" \
" <a href=\"https://bugreports.qt-project.org/\">Bug Tracker</a>\n" \ " We bake cookies in your browser for a better experience. Using this site means that you consent. <a href=\"//qt.io/terms-conditions/\">Read More</a>\n" \
" <a href=\"https://codereview.qt-project.org/\">Code Review</a>\n" \ " </p>\n" \
" <a class=\"close\"></a>\n" \
" </div>\n" \ " </div>\n" \
" <div class=\"qt13a-sixCol\">\n" \ " </div>\n" \
" <div id=\"qt13a-logo\">\n" \ " <div class=\"container\">\n" \
" <a href=\"http://qt-project.org/\" class=\"qt13a-site-logo\">\n" \ " <div class=\"navbar-header clearfix\">\n" \
" <img src=\"images/Qt-logo.png\" alt=\"Qt\"></img>\n" \ " <a href=\"#\" class=\"navbar-toggle\">\n" \
" <figure>\n" \
" <span class=\"line\"></span>\n" \
" </figure>\n" \
" <span>Menu</span>\n" \
" </a>\n" \ " </a>\n" \
" </div>\n" \ " <ul id=\"menuextras\">\n" \
" <div id=\"qt13a-title_nav\">\n" \
" <div id=\"qt13a-title\">\n" \
" <p class=\"qt13a-title\">Qt Documentation Snapshots</p>\n" \
" </div>\n" \
" <div class=\"qt13a-nav\">\n" \
" <ul>\n" \
" <li>\n" \ " <li>\n" \
" <a href=\"http://doc-snapshot.qt-project.org\">Snapshots</a>\n" \ " <a href=\"//qt.io/partners/\" data-icon=\"\">\n" \
" <span>Partners</span>\n" \
" </a>\n" \
" </li>\n" \ " </li>\n" \
" <li>\n" \ " <li>\n" \
" <a href=\"http://qt-project.org/doc\">Released</a>\n" \ " <a target=\"_blank\" href=\"http://blog.qt.digia.com/\" data-icon=\"\">\n" \
" <span>Blog</span>\n" \
" </a>\n" \
" </li>\n" \ " </li>\n" \
" <li>\n" \ " <li class=\"sign-in\">\n" \
" <a href=\"http://doc.qt.digia.com\">Archives</a>\n" \ " <a data-icon=\"\" class=\"signin\" href=\"https://account.qt.io/login\"><span>Sign in</span></a>\n" \
" </li>\n" \ " </li>\n" \
" </ul>\n" \ " </ul>\n" \
" <a href=\"http://qt.io/\" class=\"navbar-oneQt retina\" data-icon=\"\">\n" \
" </a>\n" \
" <nav class=\"navbar-menu clearfix\" role=\"navigation\">\n" \
" <ul id=\"mainmenu\" class=\"menu\"><li id=\"menu-item-21\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-21\"><a href=\"http://qt.io/product/\">Product</a></li>\n" \
"<li id=\"menu-item-1381\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-1381\"><a href=\"http://qt.io/services/\">Services</a></li>\n" \
"<li id=\"menu-item-22\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-22\"><a href=\"http://qt.io/qt-in-use/\">Qt in Use</a></li>\n" \
"<li id=\"menu-item-20\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-20\"><a href=\"http://qt.io/developers/\">Developers</a></li>\n" \
"<li id=\"menu-item-4466\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-4466\"><a href=\"http://qt.io/licensing/\">Licensing</a></li>\n" \
"<li id=\"menu-item-18\" class=\"menu-item menu-item-type-post_type menu-item-object-page menu-item-18\"><a href=\"http://qt.io/download/\">Download</a></li>\n" \
"</ul> <ul class=\"menuextraslanguages\">\n" \
" <li class=\"active dark\"><a class=\"dark\" href=\"http://qt.io/support/\">EN</a></li><li class=\"dark\"><a class=\"dark\" href=\"http://qt.io/ru/\">RU</a></li><li class=\"dark\"><a class=\"dark\" href=\"http://qt.io/zh-hans/\">ZH</a></li></ul>\n" \
" </nav>\n" \
" </div>\n" \ " </div>\n" \
" </div>\n" \ " </div>\n" \
"<div class=\"big_bar account\" style=\"\">\n" \
" <div class=\"container\">\n" \
" <h1><!-- mclude oneqt_no_cache_bMrsJxAh /wp-content/themes/oneqt/php_login_info_bottom_header.php --><!-- /mclude oneqt_no_cache_bMrsJxAh -->\n" \
" <div class=\"col-1 right big_bar_button account\" style=\"margin-top:5px !important;\"></div>\n" \
" </h1>\n" \
" </div>\n" \ " </div>\n" \
" </div>\n" \ "</div>\n" \
" </div>\n" \ "</header>\n" \
" </div>\n" \ "</div>\n" \
" <div class=\"main\">\n" \ "<div class=\"main\">\n" \
" <div class=\"main-rounded\">\n" \ "<div class=\"main-rounded\">\n" \
" <div class=\"navigationbar\">\n" \ "<div class=\"navigationbar\">\n" \
" <ul>\n" \ " <ul class=\"sub-navigation\">\n" \
" <li><a href=\"http://qt-project.org/wiki\">Wiki</a></li>\n" \
" <li><a href=\"http://doc.qt.io/\" class=\"active\">Documentation</a></li>\n" \
" <li><a href=\"http://qt-project.org/forums\">Forum</a></li>\n" \
" <li><a href=\"https://bugreports.qt-project.org/\">Bug Reports</a></li>\n" \
" <li><a href=\"https://codereview.qt-project.org/\">Code Review</a></li>\n" \
" </ul>\n" \
" <div id=\"main_title_bar\">\n" \
" <h1>Qt Documentation</h1>\n" \
" <div class=\"search_bar\">\n" \
" <script>\n" \
" (function() {\n" \
" var cx = \'003672281345882769388:1y4pftuq8so\';\n" \
" var gcse = document.createElement(\'script\');\n" \
" gcse.type = \'text/javascript\';\n" \
" gcse.async = true;\n" \
" gcse.src = (document.location.protocol == \'https:\' ? \'https:\' : \'http:\') + \'//www.google.com/cse/cse.js?cx=\' + cx;\n" \
" var s = document.getElementsByTagName(\'script\')[0];\n" \
" s.parentNode.insertBefore(gcse, s);\n" \
" })();\n" \
" </script>\n" \
" <gcse:searchbox-only resultsUrl=\"search-results.html\"></gcse:searchbox-only>\n" \
" </div></div>\n" \
" <ul>\n"
HTML.postpostheader = \ HTML.postpostheader = \
" </ul>\n" \ " </ul>\n" \
" </div>\n" \ "</div>\n" \
"<div class=\"content\">\n" \ "<div class=\"content\">\n" \
" <div class=\"line\">\n" \ " <div class=\"line\">\n" \
" <div class=\"content mainContent\">\n" \ " <div class=\"content mainContent\">\n"
HTML.prologue = \
"<div class=\"context\">\n"

39
doc/global/includes-online/search.qdoc Normal file
View File

@ -0,0 +1,39 @@
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Free Documentation License Usage
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
** this file. Please review the following information to ensure
** the GNU Free Documentation License version 1.3 requirements
** will be met: http://www.gnu.org/copyleft/fdl.html.
** $QT_END_LICENSE$
**
****************************************************************************/
/*!
\page search-results.html
\title Search Results
\raw HTML
<link rel="stylesheet" type="text/css" href="style/gsc.css" />
<script type="text/javascript">
$(function(){ $(".title").append(": " + decodeURIComponent(location.search.split('=')[1]).substring(0,32)); });
</script>
<gcse:searchresults-only></gcse:searchresults-only>
\endraw
*/

18
doc/global/qt-html-templates-online.qdocconf
View File

@ -1,23 +1,9 @@
#include standard set of HTML header and footer. #include standard set of HTML header and footer.
include(html-config.qdocconf) include(html-config.qdocconf)
include(html-header-online.qdocconf) include(html-header-online.qdocconf)
include(html-footer.qdocconf) include(html-footer-online.qdocconf)
#uncomment if navigation bar is not wanted #uncomment if navigation bar is not wanted
#HTML.nonavigationbar = "true" #HTML.nonavigationbar = "true"
HTML.stylesheets = template/style/online.css sourcedirs += includes-online
HTML.extraimages += template/images/ico_out.png \
template/images/ico_note.png \
template/images/ico_note_attention.png \
template/images/btn_prev.png \
template/images/btn_next.png \
template/images/bullet_dn.png \
template/images/bullet_sq.png \
template/images/bgrContent.png \
template/images/Qt-logo.png \
template/images/Qt-dark_gradient.png \
template/images/Qt-footer-bg.jpg \
template/images/Qt-footer_shadow.png \
template/images/Qt-gradient.png \
template/images/Qt-header-bg.jpg

3
doc/global/qt-module-defaults-offline.qdocconf
View File

@ -11,3 +11,6 @@ include(qt-html-templates-offline.qdocconf)
#extra configuration data such as file extensions #extra configuration data such as file extensions
include(config.qdocconf) include(config.qdocconf)
# Show Qt version as part of the navigation bar
buildversion = "Qt $QT_VERSION Reference Documentation"

29
doc/global/qt-module-defaults-online-commercial.qdocconf Normal file
View File

@ -0,0 +1,29 @@
# This template uses the default online template for qt.io
# and modifies it for a commercial Qt component
# Start of footer - the rest is defined in the default template
HTML.footer = \
" <p class=\"qt_commercial\">Available under certain Qt licenses.<br/><a href=\"http://www.qt.io/download/\">Find out more.</a></p>\n" \
" </div>\n"
include(macros.qdocconf)
include(qt-cpp-defines.qdocconf)
include(compat.qdocconf)
#include(manifest-meta.qdocconf)
include(fileextensions.qdocconf)
include(qt-html-templates-online.qdocconf)
#extra configuration data DITA information
include(config.qdocconf)
HTML.prologue = \
"<div class=\"context qt_commercial\">\n" \
"<a href=\"http://www.qt.io/download/\" title=\"Available under certain Qt licenses.\" ><h1 class=\"qt_commercial\">C</h1></a>\n"
# Turn off single-directory output mode
HTML.nosubdirs = "false"
# Set navigation homepage
navigation.homepage = "Qt Documentation"
sourcedirs += includes-online

19
doc/global/qt-module-defaults-online.qdocconf
View File

@ -1,7 +1,20 @@
#The online onfiguration for a Qt 5 module, including Add-Ons and Tools. #The online onfiguration for a Qt 5 module, including Add-Ons and Tools.
#Online version contains a different header.
#Include this file for a standard Qt 5 module; builds with the online style. #Include this file for a standard Qt 5 module; builds with the online style.
# Start of footer - the rest is defined in qt-html-templates-online.qdocconf
HTML.footer = \
" </div>\n" \
" <p class=\"copy-notice\">\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2014 Digia Plc and/or its\n" \
" subsidiaries. Documentation contributions included herein are the copyrights of\n" \
" their respective owners. " \
" The documentation provided herein is licensed under the terms of the" \
" <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation" \
" License version 1.3</a> as published by the Free Software Foundation. " \
" Digia, Qt and their respective logos are trademarks of Digia Plc " \
" in Finland and/or other countries worldwide. All other trademarks are property\n" \
" of their respective owners. </p>\n"
#include standard set of macros and C++ defines and ignores #include standard set of macros and C++ defines and ignores
include(macros.qdocconf) include(macros.qdocconf)
include(qt-cpp-defines.qdocconf) include(qt-cpp-defines.qdocconf)
@ -12,3 +25,7 @@ include(qt-html-templates-online.qdocconf)
#extra configuration data DITA information #extra configuration data DITA information
include(config.qdocconf) include(config.qdocconf)
# single-directory output mode
HTML.nosubdirs = "true"
HTML.outputsubdir = "html"

23
doc/global/template/scripts/extras.js Normal file
View File

@ -0,0 +1,23 @@
var vOffset = 65;
$(function () {
$('a[href*=#]:not([href=#])').on('click', function () {
var target = $(this.hash);
target = target.length ? target : $('[name=' + this.hash.slice(1) + ']');
if (target.length) {
setTimeout(function () {
$('html, body').animate({scrollTop: target.offset().top - vOffset}, 50);}, 50);
// return false;
}
});
});
$(window).load(function () {
var h = window.location.hash;
var re = /[^a-z0-9_\#\-]/i
if (h.length > 1 && !re.test(h)) {
setTimeout(function () {
$(window).scrollTop($(h).offset().top - vOffset);
}, 0);
}
});

241
doc/global/template/scripts/main.js Normal file
View File

@ -0,0 +1,241 @@
"use strict";
function createCookie(name, value, days) {
var expires;
if (days) {
var date = new Date();
date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
expires = "; expires=" + date.toGMTString();
} else {
expires = "";
}
document.cookie = escape(name) + "=" + escape(value) + expires + "; path=/";
$('.cookies_yum').click(function() {
$(this).fadeOut()
});
}
function readCookie(name) {
var nameEQ = escape(name) + "=";
var ca = document.cookie.split(';');
for (var i = 0; i < ca.length; i++) {
var c = ca[i];
while (c.charAt(0) === ' ') c = c.substring(1, c.length);
if (c.indexOf(nameEQ) === 0) return unescape(c.substring(nameEQ.length, c.length));
}
return null;
}
function eraseCookie(name) {
createCookie(name, "", -1);
}
function load_sdk(s, id, src) {
var js, fjs = document.getElementsByTagName(s)[0];
if (document.getElementById(id)) return;
js = document.createElement(s);
js.id = id;
js.src = src;
fjs.parentNode.insertBefore(js, fjs);
}
$(document).ready(function($) {
if (document.documentElement.clientWidth < 1220) {
oneQt.extraLinksToMain();
}
$('#menuextras .search').click(function(e){
e.preventDefault();
$('.big_bar.account').slideUp();
$('.big_bar.search').slideToggle();
$('.big_bar_search').focus();
$(this).toggleClass('open');
});
$('.cookies_yum').click(function() {
$('.cookies_yum').fadeOut();
createCookie("cookies_nom", "yum", 180);
var cookie_added = 1;
});
if (!(readCookie('cookies_nom') == 'yum')) {
$('.cookies_yum').fadeIn();
} else {
var cookie_added = 1;
}
Modernizr.load({test: Modernizr.input.placeholder,
nope: wpThemeFolder + '/js/placeholders.min.js'});
$('#navbar .navbar-toggle').click(function(e) {
e.preventDefault();
if ($(this).hasClass('opened')) {
$(this).removeClass('opened');
$('#navbar .navbar-menu').css('max-height', '0px');
}
else {
$(this).addClass('opened');
$('#navbar .navbar-menu').css('max-height', $('#navbar .navbar-menu ul').outerHeight() + 'px');
}
});
$(window).resize(function() {
oneQt.stickySidebar();
oneQt.footerPosition();
if (document.documentElement.clientWidth < 1220) {
oneQt.extraLinksToMain();
} else {
oneQt.mainLinkstoExtra();
}
});
$(window).scroll(function() {
oneQt.stickySidebar();
oneQt.stickyHeader();
});
oneQt.stickySidebar();
oneQt.footerPosition();
oneQt.tabContents();
});
$( window ).load(function() {
load_sdk('script', 'facebook-jssdk','//connect.facebook.net/en_US/sdk.js#xfbml=1&appId=207346529386114&version=v2.0');
load_sdk('script', 'twitter-wjs', '//platform.twitter.com/widgets.js');
$.getScript("//www.google.com/jsapi", function(){
google.load("feeds", "1", {"callback": oneQt.liveFeeds});
});
});
var oneQt = {
stickySidebar: function() {
if ($('#sidebar').length && $('#sidebar').outerHeight() > 20) {
var $sidebar = $('#sidebar');
var $win = $(window);
var $sidebarContainer = $sidebar.parent();
var headerHeight = $('#navbar').outerHeight();
if ($win.outerHeight() - headerHeight > $sidebar.innerHeight() &&
$win.scrollTop() > $sidebarContainer.offset().top) {
var newTop = headerHeight + $win.scrollTop() - $sidebarContainer.offset().top;
if (newTop + $sidebar.innerHeight() > $sidebarContainer.innerHeight())
newTop = $sidebarContainer.innerHeight() - $sidebar.innerHeight();
$sidebar.css({top: newTop +'px'})
}
else {
$sidebar.css({top: '0'})
}
}
},
footerPosition: function () {
$('#footerbar').removeClass('fixed');
if (($('.hbspt-form').length > 0) || ($('#customerInfo').length > 0) || ($('.purchase_bar').length > 0)) {
var footerBottomPos = $('#footerbar').offset().top + $('#footerbar').outerHeight();
if (footerBottomPos < $(window).height())
$('#footerbar').addClass('fixed');
}
},
stickyHeader: function () {
var originalHeaderHeight = 79;
if ($(window).scrollTop() > originalHeaderHeight) {
$('#navbar').addClass('fixed');
$('#bottom_header').fadeOut();
if (!(cookie_added == 1)) {
$('.cookies_yum').fadeOut();
createCookie("cookies_nom", "yum", 180);
var cookie_added = 1;
}
}
else {
$('#navbar').removeClass('fixed');
$('#bottom_header').fadeIn();
}
},
tabContents: function () {
$('.tab-container').each(function(i) {
var $el = $(this);
$el.find('.tab-titles li:eq(0)').addClass('active');
$el.find('.tab-contents .tab:eq(0)').addClass('active');
$el.find('.tab-titles a').click(function(e) {
e.preventDefault();
var index = $(this).parent().index();
$el.find('.tab-titles li').removeClass('active');
$el.find('.tab-contents .tab').removeClass('active');
$(this).parent().addClass('active');
$el.find('.tab-contents .tab').eq(index).addClass('active');
})
});
},
liveFeeds: function () {
$('.feed-container').each(function(i) {
var feedUrl = $(this).data('url');
if (feedUrl != "") oneQt.blogFeed($(this), feedUrl);
});
},
blogFeed: function ($container, feedUrl) {
var feed = new google.feeds.Feed(feedUrl);
feed.setNumEntries(3);
feed.load(function(result) {
$container.html('');
if (!result.error) {
for (var i = 0; i < result.feed.entries.length; i++) {
var entry = result.feed.entries[i];
var $article = $('<article class="discussion-tile cf"></article>');
$container.append($article);
var html = ' <div class="author retina">';
html += ' <img src="'+wpThemeFolder+'/assets/images/author_placeholder.png" alt="">';
html += ' </div>';
html += ' <div class="discussion-item">';
html += ' <h4><a href="'+encodeURI(entry.link)+'"></a></h4>'
html += ' <h3><a href="'+encodeURI(entry.link)+'" target="_blank"></a></h3>'
html += ' <p><a href="'+encodeURI(entry.link)+'" target="_blank"></a></p>';
html += ' <ul class="taglist cf">';
html += ' </ul>';
html += ' </div>';
$article.append(html);
$article.find('h4 a').text(result.feed.title);
$article.find('h3 a').text(entry.title);
$article.find('p a').text(entry.author);
try {
for (var j=0; j<entry.categories.length; j++) {
var $li = $('<li><a href="'+encodeURI(entry.link)+'" target="_blank" class="btn btn-tag"></a></li>');
$li.find('a').text(entry.categories[j]);
$article.find('.taglist').append($li);
}
} catch(e) {}
}
if (result.feed.link && result.feed.link != "") {
var linkHtml = '<a href="'+encodeURI(result.feed.link)+'" class="text-lightgrey" target="_blank">Show all</a>';
$container.append(linkHtml);
}
}
});
},
extraLinksToMain: function() {
var extramenuLinks = $('#menuextras').find('li');
var mainmenu = $('#mainmenu');
var count = 0;
if ($(extramenuLinks).length > 3) {
$(extramenuLinks).each(function() {
if (count < 3) {
var newLink = $(this);
$(newLink).addClass('dynamic-add');
$(mainmenu).append(newLink);
}
count++;
});
}
},
mainLinkstoExtra: function() {
var mainmenuLinks = $('#mainmenu').find('.dynamic-add');
var extramenu = $('#menuextras');
var count = 0;
$(mainmenuLinks).each(function() {
var newLink = $(this);
$(extramenu).prepend(newLink);
count++;
});
}
}

BIN
doc/global/template/style/doc_search.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

192
doc/global/template/style/gsc.css Normal file
View File

@ -0,0 +1,192 @@
.gsc-control-cse table, table td, table th {
border: none !important;
margin-bottom: 10px !important
}
.gsc-control-cse {
width: 100% !important;
box-sizing: border-box !important
}
.gsc-control-cse * {
font-family: 'Open Sans', Arial, Helvetica, sans-serif !important;
line-height: 1.5 !important;
font-weight: 300 !important
}
.gsc-control-cse,
.gsc-control-cse .gsc-table-result {
width: 100% !important;
font-family: 'Open Sans', Arial, Helvetica, sans-serif !important;
font-weight: 300 !important;
font-size: 13px !important
}
.gsc-resultsHeader {
width: 100% !important;
clear: both !important
}
.gsc-resultsHeader td.gsc-twiddleRegionCell {
width: 75% !important
}
.gsc-resultsbox-visible {
display: block !important
}
.gsc-resultsbox-invisible {
display: none !important
}
.gsc-results {
padding-bottom: 2px !important;
width: 99% !important
}
.gsc-result {
margin-bottom: 10px !important
}
.gsc-result .gs-title {
height: 1.4em !important;
overflow: hidden !important
}
.gsc-result div.gs-watermark {
display: none !important
}
.gsc-results .gsc-result img.gs-ad-marker {
display: none !important
}
.gsc-webResult:after {
content: "." !important;
display: block !important;
height: 0 !important;
clear: both !important;
visibility: hidden !important
}
.gsc-webResult {
zoom: 1 !important
}
.gsc-webResult .gsc-result {
margin: 0 !important;
padding: .5em 0 !important;
border-bottom: 1px solid #ebebeb !important
}
.gsc-above-wrapper-area {
border-bottom: 1px solid #E9E9E9 !important;
padding: 5px 0 5px 0 !important
}
.gsc-above-wrapper-area-invisible {
display: none !important
}
.gsc-above-wrapper-area-container {
width: 100% !important
}
.gsc-result-info {
text-align: left !important;
color: #676767 !important;
font-size: 13px !important;
padding-left: 8px !important;
margin: 10px 0 10px 0 !important
}
.gsc-result-info-container {
text-align: left !important
}
.gsc-result-info-invisible {
display: none !important
}
.gsc-orderby-container {
text-align: right !important;
background: transparent !important
}
.gsc-orderby-invisible {
display: none !important
}
.gsc-orderby-label {
color: #676767 !important;
padding: 5px 5px 6px 0 !important
}
.gsc-selected-option-container {
background-color: transparent !important;
border: 1px solid #eee !important;
border: 1px solid rgba(0, 0, 0, 0.1) !important;
border-radius: 2px !important;
box-shadow: none !important;
color: #444 !important;
cursor: default !important;
font-size: 11px !important;
font-weight: bold !important;
height: 20px !important;
line-height: 20px !important;
max-width: 90% !important;
min-width: 54px !important;
outline: 0 !important;
padding: 0 28px 0 6px !important;
position: relative !important;
text-align: center !important;
width: 50px !important !important
}
.gsc-selected-option {
position: relative !important;
width: 100% !important;
}
.gsc-control-cse .gsc-option-selector {
border: none !important;
height: 11px !important;
margin-top: -4px !important;
position: absolute !important;
right: 5px !important;
top: 8px !important;
width: 7px !important;
padding: 0 5px 0 5px !important;
background: url(//ssl.gstatic.com/ui/v1/disclosure/small-grey-disclosure-arrow-down.png) center no-repeat
}
.gsc-results .gsc-cursor-box .gsc-trailing-more-results {
margin-bottom: 0 !important;
display: inline !important
}
.gsc-results .gsc-cursor {
display: inline !important
}
.gsc-results .gsc-cursor-box {
margin: 10px 5px 10px !important
}
.gsc-results .gsc-cursor-box .gsc-cursor-page {
cursor: pointer !important;
color: #000000 !important;
text-decoration: underline !important;
margin-right: 8px !important;
display: inline !important
}
.gsc-results .gsc-cursor-box .gsc-cursor-current-page {
cursor: default !important;
color: white !important;
background-color: #5caa15 !important;
font-weight: bold !important;
text-decoration: none !important;
padding: 0 3px 0 3px !important;
margin-top: 10px !important;
cursor: pointer !important
}
.gs-result .gs-title,
.gs-result .gs-title * {
color: #5caa15 !important;
text-decoration: underline !important
}
.gs-webResult div.gs-visibleUrl-long,
.gs-promotion div.gs-visibleUrl-long {
overflow: hidden !important;
display: none !important
}
.gs-webResult div.gs-per-result-labels a.gs-label {
text-decoration: underline !important;
cursor: pointer !important;
padding: 3px !important;
color: #26282a !important
}
.gs-webResult div.gs-per-result-labels a.gs-label.gs-labelActive {
cursor: default !important;
text-decoration: none !important
}
.gsc-control-cse:after {
content: "." !important;
display: block !important;
clear: both !important;
height: 0 !important;
visibility: hidden !important
}
*:first-child + html .gsc-inline-block {
display: inline !important
}

BIN
doc/global/template/style/icomoon.eot Executable file
View File

Binary file not shown.

20
doc/global/template/style/icomoon.svg Executable file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Generated by IcoMoon</metadata>
<defs>
<font id="icomoon" horiz-adv-x="512">
<font-face units-per-em="512" ascent="480" descent="-32" />
<missing-glyph horiz-adv-x="512" />
<glyph unicode="&#x20;" d="" horiz-adv-x="256" />
<glyph unicode="&#xe600;" d="M70.281 478.981c-38.026 6.451-70.281-21.729-70.281-62.472v-448.51l347.671 58.398c24.106 4.075 42.78 32.255 42.78 62.812v337.486l-320.17 52.286zM232.233 147.608c-10.185-23.767-25.464-39.045-46.175-46.514 2.037-10.865 5.433-17.655 9.506-21.729 2.376-2.037 5.772-3.735 9.846-3.735h11.544c-2.376 0-4.414-0.679-6.451-0.679l0.339-0.339c2.037 0 3.055 0 6.451 0.339v-31.915l-14.939-2.037c-4.414-0.679-8.488-0.679-12.223-0.679-12.902 0-23.088 3.055-30.897 9.507-10.185 8.149-17.994 24.106-22.748 47.533-22.409 4.753-39.724 19.014-51.608 42.78-12.223 24.106-18.334 59.416-18.334 105.931 0 49.91 8.488 86.578 25.124 110.005 14.26 19.692 33.953 29.538 58.737 29.538 4.075 0 8.149-0.339 12.223-0.679 29.199-3.395 50.25-16.976 64.17-41.082 13.581-23.427 20.032-56.7 20.032-100.838 0-40.403-4.754-71.979-14.6-95.406zM346.313 125.199c-13.581-5.433-24.785-8.827-37.008-9.846-1.697 0-3.395-0.339-5.093-0.339-10.865 0-19.692 3.055-25.464 9.507-6.791 7.469-10.525 19.353-10.525 35.65v125.623l-13.581 0.679v33.273l17.994-1.358 11.884 49.57 27.841-3.055v-49.231l30.557-2.376v-30.897l-30.557 1.358v-113.061c0-9.846 1.019-16.297 3.055-19.014s5.093-3.735 9.167-3.735c0.339 0 1.019 0 1.358 0 6.111 0.339 13.581 2.377 20.372 5.772v-28.52zM162.631 347.586c-1.018 0-1.697 0-2.716 0-10.525 0-18.673-6.111-24.446-18.673-6.112-13.581-9.167-41.422-9.167-84.202 0-41.082 3.055-70.281 9.167-87.257 5.772-16.297 14.26-24.445 25.803-24.445 0.339 0 1.018 0 1.358 0 11.204 0.679 19.692 8.488 25.464 23.427 5.772 14.599 8.488 43.798 8.488 86.918 0 38.706-2.716 65.528-8.488 80.127-5.433 14.939-13.921 23.088-25.464 24.106zM206.090 75.289v0zM206.090 75.289c1.358 0 2.716 0 4.414 0 2.037 0 4.075 0.679 6.451 0.679h-11.544l0.679-0.679z" horiz-adv-x="391" />
<glyph unicode="&#xe601;" d="M511.589 224.206c0-141.272-114.523-255.794-255.794-255.794s-255.794 114.523-255.794 255.794c0 141.271 114.523 255.794 255.794 255.794s255.794-114.523 255.794-255.794zM192.565 127.717c0-18.066-14.781-32.436-32.436-32.436s-32.847 14.37-32.847 32.436c0 18.066 14.781 32.436 32.436 32.436s32.847-14.37 32.847-32.436zM127.281 367.91v-50.502c133.030 0 221.716-89.097 221.716-222.127h50.502c0 165.466-107.163 272.628-272.218 272.628zM142.473 262.8c-3.696 0-11.496 0-15.192-0.411v-45.164c3.695 0.411 11.497 0.411 15.192 0.411 61.999 0 107.163-45.164 107.163-107.163 0-3.695 0-11.907-0.411-15.192h45.575c0.411 3.695 0.411 11.497 0.411 15.192-0.411 94.024-58.714 152.327-152.738 152.327z" />
<glyph unicode="&#xe602;" d="M511.589 224.206c0-141.272-114.523-255.794-255.794-255.794s-255.794 114.523-255.794 255.794c0 141.271 114.523 255.794 255.794 255.794s255.794-114.523 255.794-255.794zM382.666 298.111h-253.331c-8.212 0-14.781 6.57-14.781 14.781v18.887c0 8.212 6.57 14.781 14.781 14.781h253.331c8.212 0 14.781-6.57 14.781-14.781v-18.887c0-8.212-6.57-14.781-14.781-14.781zM382.666 199.981h-253.331c-8.212 0-14.781 6.57-14.781 14.781v18.887c0 8.212 6.57 14.781 14.781 14.781h253.331c8.212 0 14.781-6.57 14.781-14.781v-18.887c0-8.212-6.57-14.781-14.781-14.781zM382.666 101.44h-253.331c-8.212 0-14.781 6.57-14.781 14.781v18.887c0 8.212 6.57 14.781 14.781 14.781h253.331c8.212 0 14.781-6.57 14.781-14.781v-18.887c0-7.801-6.57-14.781-14.781-14.781z" />
<glyph unicode="&#xe603;" d="M511.795 224c0-141.272-114.524-255.795-255.795-255.795s-255.795 114.524-255.795 255.795c0 141.272 114.523 255.795 255.795 255.795s255.795-114.524 255.795-255.795zM405.529 256.947l-103.168 14.797-46.566 92.646-46.080-92.646-103.245-14.797 74.471-71.68-17.664-101.581 92.416 47.974 93.056-48.051-17.69 101.657z" />
<glyph unicode="&#xe604;" d="M511.589 224.206c0-141.272-114.523-255.794-255.794-255.794s-255.794 114.523-255.794 255.794c0 141.271 114.523 255.794 255.794 255.794s255.794-114.523 255.794-255.794zM379.381 126.486l-74.726 75.137c12.728 17.245 20.118 39.005 20.118 61.998 0 29.152-11.907 55.429-30.794 74.316-18.887 19.298-45.575 31.204-74.726 31.204s-55.429-11.907-74.316-30.794c-18.887-18.887-30.794-45.575-30.794-74.316 0-29.151 11.907-55.429 30.794-74.316s45.575-30.794 74.316-30.794c20.119 0 38.595 5.748 54.608 15.192l75.959-75.959c5.337-5.337 13.96-5.337 19.298 0l9.854 9.854c5.748 4.517 5.748 13.139 0.411 18.476zM165.055 209.424c-13.96 13.96-22.582 32.847-22.582 54.197s8.623 40.238 22.582 54.197c13.96 13.96 32.847 22.582 54.197 22.582s40.238-8.623 54.197-22.582c13.96-13.96 22.582-32.847 22.582-54.197s-8.623-40.238-22.582-54.197c-13.96-13.96-32.847-22.582-54.197-22.582-20.94 0-40.238 8.623-54.197 22.582z" />
<glyph unicode="&#xe605;" d="M511.589 224.206c0-141.272-114.523-255.794-255.794-255.794s-255.794 114.523-255.794 255.794c0 141.271 114.523 255.794 255.794 255.794s255.794-114.523 255.794-255.794zM255.794-22.557c67.746 0 129.335 27.509 174.088 71.442-5.748 4.106-11.907 8.623-18.887 13.55-22.993 15.602-52.966 34.9-92.382 59.535-1.642 1.232-2.874 2.464-3.284 3.695-0.821 1.232-1.232 2.464-1.232 3.284-0.411 2.053-0.821 4.106-0.821 6.159 0 4.927 0.821 10.264 2.874 16.423 1.642 6.159 4.517 12.317 7.801 18.476 2.053 3.695 4.927 9.854 7.39 17.655s4.927 17.655 7.39 28.741c4.517 22.172 7.39 49.681 7.39 79.243 0 13.138-5.337 29.973-14.781 45.575-9.854 15.602-23.404 29.972-39.827 38.595-11.086 5.748-22.993 9.033-35.721 9.033v0 0c-18.476-0.411-35.31-7.801-49.681-19.708s-25.867-27.92-32.847-43.933c-4.517-10.675-6.57-20.94-6.57-29.562 0-22.171 1.643-43.112 4.517-61.588s6.57-34.489 10.264-45.986c2.464-7.801 5.338-13.96 7.391-17.655 3.696-5.748 6.159-12.317 7.801-18.476s2.874-11.497 2.874-16.423c0-1.642 0-2.874-0.411-4.517s-0.821-3.284-1.643-4.927c-0.821-1.232-1.643-2.464-3.285-3.695-51.323-32.026-87.044-55.429-111.679-73.084 43.933-44.343 105.52-71.853 173.267-71.853z" />
<glyph unicode="&#xe606;" d="M511.087 224.411c0-141.109-114.392-255.502-255.501-255.502s-255.501 114.392-255.501 255.501c0 141.109 114.392 255.501 255.501 255.501s255.501-114.392 255.501-255.501zM369.577 360.185h-227.981c-2.263-0.003-4.095-1.838-4.098-4.098v-263.767c0.003-2.263 1.838-4.095 4.098-4.098h227.981c2.263 0.003 4.095 1.838 4.098 4.098v263.767c-0.007 2.263-1.838 4.095-4.098 4.098zM291.959 165.217c0-4.507-3.688-8.197-8.197-8.197h-112.482c-4.507 0-8.196 3.688-8.196 8.197v2.263c0 4.507 3.689 8.197 8.197 8.197h112.482c4.507 0 8.197-3.688 8.197-8.197v-2.263zM348.089 210.007c0-4.507-3.688-8.197-8.197-8.197h-168.612c-4.507 0-8.196 3.688-8.196 8.197v2.263c0 4.507 3.689 8.197 8.197 8.197h168.608c4.507 0 8.197-3.688 8.197-8.197v-2.263zM348.089 254.796c0-4.507-3.688-8.197-8.197-8.197h-168.612c-4.507 0-8.196 3.689-8.196 8.197v2.263c0 4.508 3.689 8.197 8.197 8.197h168.608c4.507 0 8.197-3.688 8.197-8.197v-2.263zM348.089 299.584c0-4.507-3.688-8.197-8.197-8.197h-168.612c-4.507 0-8.196 3.689-8.196 8.197v2.263c0 4.508 3.689 8.197 8.197 8.197h168.608c4.507 0 8.197-3.688 8.197-8.197v-2.263z" />
<glyph unicode="&#xe607;" d="M0 139.988v153.96c0 19.471 0.36 36.417 3.966 50.84 36.056 11.538 85.093 18.389 127.279 18.389 23.797 0 53.724-2.524 75.719-5.409v122.231h55.166v-340.012c0-18.389-0.361-35.335-3.966-51.56-34.254-11.538-86.535-18.389-126.918-18.389-42.547 0-89.059 6.49-126.197 17.668-3.606 16.947-5.048 34.253-5.048 52.281zM57.33 308.372c-1.443-7.572-2.163-19.471-2.163-34.974v-113.578c0-18.389 0.721-29.927 2.163-34.974 20.191-5.409 49.758-7.933 73.916-7.933 27.042 0 56.248 3.245 73.555 8.293 1.442 5.048 2.163 16.586 2.163 34.614v150.355c-21.634 3.606-51.921 5.769-76.44 5.769-23.436 0.361-51.56-3.245-73.195-7.572zM389.048 360.293v-287.009h-55.887v287.009h55.887zM658.028 28.214c1.442 6.49 2.163 15.144 2.163 24.879v29.566c-22.355-2.524-50.479-4.327-72.112-4.327-41.826 0-89.059 6.13-123.673 17.668-2.885 16.947-4.327 33.893-4.327 51.2v146.75c0 18.028 1.442 34.974 4.327 50.839 34.254 11.538 81.848 18.389 123.673 18.389 41.465 0 87.256-6.851 123.673-18.389 3.606-16.586 3.966-32.812 3.966-50.839v-271.865c-15.865-46.512-64.18-54.084-124.034-54.084-25.961 0-62.377 4.327-91.583 10.096v43.988c29.206-5.769 72.834-9.735 108.169-7.933 19.11 0.721 40.383 5.769 49.758 14.062zM660.192 129.533v143.865c0 16.586-0.361 27.403-2.524 34.975-19.471 4.327-45.792 7.933-69.588 7.933-23.437 0-50.119-3.245-69.588-7.933-1.803-7.572-2.885-19.471-2.885-34.975v-107.087c0-15.865 1.082-27.403 2.885-34.974 18.389-5.409 45.431-7.933 69.228-7.933 23.076 0.361 50.479 2.163 72.473 6.13zM842.276 360.293v-287.009h-55.888v287.009h55.888zM1159.211 344.067c-36.417 12.62-73.555 18.75-115.741 18.75-36.057 0-91.583-5.769-123.673-15.144v-51.2h27.403c5.048 4.327 9.014 10.096 11.899 16.226 10.457 2.524 32.812 5.048 74.637 5.048 23.797 0 51.2-3.966 71.752-8.293 1.443-13.341 2.524-26.681 2.524-38.941v-23.076h-120.067c-22.355 0-51.2-3.245-75.357-12.619-3.606-15.143-4.688-32.451-5.048-44.71v-50.118c0-18.028 1.442-35.335 5.048-51.921 36.778-11.538 84.011-17.668 126.557-17.668 40.383 0 85.814 6.13 120.068 17.668 3.605 15.865 3.966 32.812 3.966 51.2v143.504c0 15.504-0.361 34.974-3.966 61.296zM998.039 206.693h110.333v-35.696c0-14.423 0.361-34.614-1.803-46.152-17.307-5.048-40.023-7.572-66.704-7.572-1.443 0-2.884 0-3.966 0-23.076 0-52.282 2.524-71.391 7.572-1.803 10.817-2.885 26.321-2.885 35.696v3.606c0 8.293 0.361 27.043 3.606 38.581 8.293 2.885 19.11 3.966 32.812 3.966zM912.586 234.817c-3.606-15.144-5.048-44.71-5.048-44.71v-50.118zM387.966 476.034v-59.493h-55.887v59.493h55.887zM842.276 476.034v-59.493h-55.888v59.493h55.888z" horiz-adv-x="1163" />
<glyph unicode="&#xe608;" d="M512.419 224.922c0-141.385-114.615-256-256-256s-256 114.615-256 256c0 141.385 114.615 256 256 256s256-114.615 256-256zM414.157 260.356l-108.984 15.832-48.921 98.764-7.456-15.246-41.047-83.519-108.984-15.832 78.744-76.9-18.597-108.565 97.424 51.267 97.759-51.267-18.597 108.565 78.659 76.9zM256.252 145.005l-75.142-39.539 14.409 83.769-60.817 59.309 84.189 12.314 37.362 76.231 37.78-76.231 84.188-12.231-60.817-59.309 14.409-83.853-75.56 39.539z" horiz-adv-x="513" />
<glyph unicode="&#xe609;" d="M511.795 224c0-141.272-114.524-255.795-255.795-255.795s-255.795 114.524-255.795 255.795c0 141.272 114.523 255.795 255.795 255.795s255.795-114.524 255.795-255.795zM418.457 266.368l-112.435 16.128-50.279 100.070-11.392-22.912-38.4-77.159-112.409-16.102 81.229-78.183-19.174-110.157 100.224 51.993 100.582-51.942-19.175 110.106 81.229 78.157z" />
</font></defs></svg>
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
doc/global/template/style/icomoon.ttf Executable file
View File

Binary file not shown.

BIN
doc/global/template/style/icomoon.woff Executable file
View File

Binary file not shown.

BIN
doc/global/template/style/list_arrow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

2511
doc/global/template/style/online.css
View File

File diff suppressed because it is too large Load Diff

2
qmake/doc/qmake.qdocconf
View File

@ -73,3 +73,5 @@ depends += \
qtx11extras \ qtx11extras \
qtxml \ qtxml \
qtxmlpatterns qtxmlpatterns
navigation.landingpage = "qmake Manual"

3
src/corelib/io/qfilesystemwatcher_fsevents.mm
View File

@ -518,7 +518,6 @@ bool QFseventsFileSystemWatcherEngine::startStream()
NULL NULL
}; };
const CFAbsoluteTime latency = .5; // in seconds const CFAbsoluteTime latency = .5; // in seconds
FSEventStreamCreateFlags flags = kFSEventStreamCreateFlagWatchRoot;
// Never start with kFSEventStreamEventIdSinceNow, because this will generate an invalid // Never start with kFSEventStreamEventIdSinceNow, because this will generate an invalid
// soft-assert in FSEventStreamFlushSync in CarbonCore when no event occurred. // soft-assert in FSEventStreamFlushSync in CarbonCore when no event occurred.
@ -530,7 +529,7 @@ bool QFseventsFileSystemWatcherEngine::startStream()
reinterpret_cast<CFArrayRef>(pathsToWatch), reinterpret_cast<CFArrayRef>(pathsToWatch),
lastReceivedEvent, lastReceivedEvent,
latency, latency,
flags); FSEventStreamCreateFlags(0));
if (!stream) { if (!stream) {
DEBUG() << "Failed to create stream!"; DEBUG() << "Failed to create stream!";

3
src/dbus/dbus.pro
View File

@ -61,7 +61,8 @@ HEADERS += $$PUB_HEADERS \
qdbusintegrator_p.h \ qdbusintegrator_p.h \
qdbuspendingcall_p.h \ qdbuspendingcall_p.h \
qdbus_symbols_p.h \ qdbus_symbols_p.h \
qdbusintrospection_p.h qdbusintrospection_p.h \
dbus_minimal_p.h
SOURCES += qdbusconnection.cpp \ SOURCES += qdbusconnection.cpp \
qdbusconnectioninterface.cpp \ qdbusconnectioninterface.cpp \
qdbuserror.cpp \ qdbuserror.cpp \

275
src/dbus/dbus_minimal_p.h Normal file
View File

@ -0,0 +1,275 @@
/****************************************************************************
**
** Copyright (C) 2014 Intel Corporation
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtDBus module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL21$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef DBUS_MINIMAL_P_H
#define DBUS_MINIMAL_P_H
extern "C" {
// Equivalent to dbus-arch-deps.h
typedef qint64 dbus_int64_t;
typedef quint64 dbus_uint64_t;
typedef qint32 dbus_int32_t;
typedef quint32 dbus_uint32_t;
typedef qint16 dbus_int16_t;
typedef quint16 dbus_uint16_t;
// simulate minimum version we support
#define DBUS_MAJOR_VERSION 1
#define DBUS_MINOR_VERSION 2
#define DBUS_VERSION ((1 << 16) | (2 << 8))
// forward declaration to opaque types we use
struct DBusConnection;
struct DBusMessage;
struct DBusPendingCall;
struct DBusServer;
struct DBusTimeout;
struct DBusWatch;
// This file contains constants and typedefs from libdbus-1 headers,
// which carry the following copyright:
/*
* Copyright (C) 2002, 2003 CodeFactory AB
* Copyright (C) 2004, 2005 Red Hat, Inc.
*
* Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
/* dbus-types.h */
typedef dbus_uint32_t dbus_unichar_t;
typedef dbus_uint32_t dbus_bool_t;
/* dbus-shared.h */
#define DBUS_SERVICE_DBUS "org.freedesktop.DBus"
#define DBUS_PATH_DBUS "/org/freedesktop/DBus"
#define DBUS_INTERFACE_DBUS "org.freedesktop.DBus"
#define DBUS_INTERFACE_INTROSPECTABLE "org.freedesktop.DBus.Introspectable"
#define DBUS_INTERFACE_PROPERTIES "org.freedesktop.DBus.Properties"
#define DBUS_NAME_FLAG_ALLOW_REPLACEMENT 0x1 /**< Allow another service to become the primary owner if requested */
#define DBUS_NAME_FLAG_REPLACE_EXISTING 0x2 /**< Request to replace the current primary owner */
#define DBUS_NAME_FLAG_DO_NOT_QUEUE 0x4 /**< If we can not become the primary owner do not place us in the queue */
#define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER 1 /**< Service has become the primary owner of the requested name */
#define DBUS_REQUEST_NAME_REPLY_IN_QUEUE 2 /**< Service could not become the primary owner and has been placed in the queue */
#define DBUS_REQUEST_NAME_REPLY_EXISTS 3 /**< Service is already in the queue */
#define DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER 4 /**< Service is already the primary owner */
#define DBUS_RELEASE_NAME_REPLY_RELEASED 1 /**< Service was released from the given name */
#define DBUS_RELEASE_NAME_REPLY_NON_EXISTENT 2 /**< The given name does not exist on the bus */
#define DBUS_RELEASE_NAME_REPLY_NOT_OWNER 3 /**< Service is not an owner of the given name */
typedef enum
{
DBUS_BUS_SESSION, /**< The login session bus */
DBUS_BUS_SYSTEM, /**< The systemwide bus */
DBUS_BUS_STARTER /**< The bus that started us, if any */
} DBusBusType;
typedef enum
{
DBUS_HANDLER_RESULT_HANDLED, /**< Message has had its effect - no need to run more handlers. */
DBUS_HANDLER_RESULT_NOT_YET_HANDLED, /**< Message has not had any effect - see if other handlers want it. */
DBUS_HANDLER_RESULT_NEED_MEMORY /**< Need more memory in order to return #DBUS_HANDLER_RESULT_HANDLED or #DBUS_HANDLER_RESULT_NOT_YET_HANDLED. Please try again later with more memory. */
} DBusHandlerResult;
/* dbus-memory.h */
typedef void (* DBusFreeFunction) (void *memory);
/* dbus-connection.h */
typedef enum
{
DBUS_WATCH_READABLE = 1 << 0, /**< As in POLLIN */
DBUS_WATCH_WRITABLE = 1 << 1, /**< As in POLLOUT */
DBUS_WATCH_ERROR = 1 << 2, /**< As in POLLERR (can't watch for
* this, but can be present in
* current state passed to
* dbus_watch_handle()).
*/
DBUS_WATCH_HANGUP = 1 << 3 /**< As in POLLHUP (can't watch for
* it, but can be present in current
* state passed to
* dbus_watch_handle()).
*/
/* Internal to libdbus, there is also _DBUS_WATCH_NVAL in dbus-watch.h */
} DBusWatchFlags;
typedef enum
{
DBUS_DISPATCH_DATA_REMAINS, /**< There is more data to potentially convert to messages. */
DBUS_DISPATCH_COMPLETE, /**< All currently available data has been processed. */
DBUS_DISPATCH_NEED_MEMORY /**< More memory is needed to continue. */
} DBusDispatchStatus;
typedef dbus_bool_t (* DBusAddWatchFunction) (DBusWatch *watch,
void *data);
typedef void (* DBusWatchToggledFunction) (DBusWatch *watch,
void *data);
typedef void (* DBusRemoveWatchFunction) (DBusWatch *watch,
void *data);
typedef dbus_bool_t (* DBusAddTimeoutFunction) (DBusTimeout *timeout,
void *data);
typedef void (* DBusTimeoutToggledFunction) (DBusTimeout *timeout,
void *data);
typedef void (* DBusRemoveTimeoutFunction) (DBusTimeout *timeout,
void *data);
typedef void (* DBusDispatchStatusFunction) (DBusConnection *connection,
DBusDispatchStatus new_status,
void *data);
typedef void (* DBusWakeupMainFunction) (void *data);
typedef void (* DBusPendingCallNotifyFunction) (DBusPendingCall *pending,
void *user_data);
typedef DBusHandlerResult (* DBusHandleMessageFunction) (DBusConnection *connection,
DBusMessage *message,
void *user_data);
/* dbus-errors.h */
struct DBusError
{
const char *name; /**< public error name field */
const char *message; /**< public error message field */
unsigned int dummy1 : 1; /**< placeholder */
unsigned int dummy2 : 1; /**< placeholder */
unsigned int dummy3 : 1; /**< placeholder */
unsigned int dummy4 : 1; /**< placeholder */
unsigned int dummy5 : 1; /**< placeholder */
void *padding1; /**< placeholder */
};
/* dbus-message.h */
struct DBusMessageIter
{
void *dummy1; /**< Don't use this */
void *dummy2; /**< Don't use this */
dbus_uint32_t dummy3; /**< Don't use this */
int dummy4; /**< Don't use this */
int dummy5; /**< Don't use this */
int dummy6; /**< Don't use this */
int dummy7; /**< Don't use this */
int dummy8; /**< Don't use this */
int dummy9; /**< Don't use this */
int dummy10; /**< Don't use this */
int dummy11; /**< Don't use this */
int pad1; /**< Don't use this */
int pad2; /**< Don't use this */
void *pad3; /**< Don't use this */
};
/* dbus-protocol.h */
#define DBUS_TYPE_INVALID ((int) '\0')
#define DBUS_TYPE_INVALID_AS_STRING "\0"
#define DBUS_TYPE_BYTE ((int) 'y')
#define DBUS_TYPE_BYTE_AS_STRING "y"
#define DBUS_TYPE_BOOLEAN ((int) 'b')
#define DBUS_TYPE_BOOLEAN_AS_STRING "b"
#define DBUS_TYPE_INT16 ((int) 'n')
#define DBUS_TYPE_INT16_AS_STRING "n"
#define DBUS_TYPE_UINT16 ((int) 'q')
#define DBUS_TYPE_UINT16_AS_STRING "q"
#define DBUS_TYPE_INT32 ((int) 'i')
#define DBUS_TYPE_INT32_AS_STRING "i"
#define DBUS_TYPE_UINT32 ((int) 'u')
#define DBUS_TYPE_UINT32_AS_STRING "u"
#define DBUS_TYPE_INT64 ((int) 'x')
#define DBUS_TYPE_INT64_AS_STRING "x"
#define DBUS_TYPE_UINT64 ((int) 't')
#define DBUS_TYPE_UINT64_AS_STRING "t"
#define DBUS_TYPE_DOUBLE ((int) 'd')
#define DBUS_TYPE_DOUBLE_AS_STRING "d"
#define DBUS_TYPE_STRING ((int) 's')
#define DBUS_TYPE_STRING_AS_STRING "s"
#define DBUS_TYPE_OBJECT_PATH ((int) 'o')
#define DBUS_TYPE_OBJECT_PATH_AS_STRING "o"
#define DBUS_TYPE_SIGNATURE ((int) 'g')
#define DBUS_TYPE_SIGNATURE_AS_STRING "g"
#define DBUS_TYPE_UNIX_FD ((int) 'h')
#define DBUS_TYPE_UNIX_FD_AS_STRING "h"
#define DBUS_TYPE_ARRAY ((int) 'a')
#define DBUS_TYPE_ARRAY_AS_STRING "a"
#define DBUS_TYPE_VARIANT ((int) 'v')
#define DBUS_TYPE_VARIANT_AS_STRING "v"
#define DBUS_TYPE_STRUCT ((int) 'r')
#define DBUS_TYPE_STRUCT_AS_STRING "r"
#define DBUS_TYPE_DICT_ENTRY ((int) 'e')
#define DBUS_TYPE_DICT_ENTRY_AS_STRING "e"
#define DBUS_STRUCT_BEGIN_CHAR ((int) '(')
#define DBUS_STRUCT_BEGIN_CHAR_AS_STRING "("
#define DBUS_STRUCT_END_CHAR ((int) ')')
#define DBUS_STRUCT_END_CHAR_AS_STRING ")"
#define DBUS_DICT_ENTRY_BEGIN_CHAR ((int) '{')
#define DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING "{"
#define DBUS_DICT_ENTRY_END_CHAR ((int) '}')
#define DBUS_DICT_ENTRY_END_CHAR_AS_STRING "}"
#define DBUS_MESSAGE_TYPE_INVALID 0
#define DBUS_MESSAGE_TYPE_METHOD_CALL 1
#define DBUS_MESSAGE_TYPE_METHOD_RETURN 2
#define DBUS_MESSAGE_TYPE_ERROR 3
#define DBUS_MESSAGE_TYPE_SIGNAL 4
#define DBUS_MAXIMUM_NAME_LENGTH 255
#define DBUS_INTROSPECT_1_0_XML_NAMESPACE "http://www.freedesktop.org/standards/dbus"
#define DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
#define DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"
#define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<!DOCTYPE node PUBLIC \"" DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER "\"\n\"" DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "\">\n"
/* dbus-server.h */
typedef void (* DBusNewConnectionFunction) (DBusServer *server,
DBusConnection *new_connection,
void *data);
} // extern "C"
#endif // DBUS_MINIMAL_P_H

7
src/dbus/qdbus_symbols_p.h
View File

@ -47,10 +47,15 @@
#define QDBUS_SYMBOLS_P_H #define QDBUS_SYMBOLS_P_H
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#include <dbus/dbus.h>
#ifndef QT_NO_DBUS #ifndef QT_NO_DBUS
#ifdef QT_LINKED_LIBDBUS
# include <dbus/dbus.h>
#else
# include "dbus_minimal_p.h"
#endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#if !defined QT_LINKED_LIBDBUS #if !defined QT_LINKED_LIBDBUS

4
src/gui/opengl/qopenglframebufferobject.cpp
View File

@ -481,11 +481,9 @@ void QOpenGLFramebufferObjectPrivate::init(QOpenGLFramebufferObject *, const QSi
GLenum storageFormat = internal_format; GLenum storageFormat = internal_format;
// ES requires a sized format. The older desktop extension does not. Correct the format on ES. // ES requires a sized format. The older desktop extension does not. Correct the format on ES.
if (ctx->isOpenGLES() && internal_format == GL_RGBA) { if (ctx->isOpenGLES() && internal_format == GL_RGBA) {
#ifdef GL_RGBA8_OES
if (funcs.hasOpenGLExtension(QOpenGLExtensions::Sized8Formats)) if (funcs.hasOpenGLExtension(QOpenGLExtensions::Sized8Formats))
storageFormat = GL_RGBA8_OES; storageFormat = GL_RGBA8;
else else
#endif
storageFormat = GL_RGBA4; storageFormat = GL_RGBA4;
} }

3
src/plugins/platforms/android/qandroidplatformtheme.cpp
View File

@ -278,7 +278,8 @@ static std::shared_ptr<AndroidStyle> loadAndroidStyle(QPalette *defaultPalette)
const int pt = paletteType(key); const int pt = paletteType(key);
if (pt > -1 || !qtClassName.isEmpty()) { if (pt > -1 || !qtClassName.isEmpty()) {
// Extract palette information // Extract palette information
QPalette palette; QPalette palette = *defaultPalette;
attributeIterator = item.find(QLatin1String("defaultTextColorPrimary")); attributeIterator = item.find(QLatin1String("defaultTextColorPrimary"));
if (attributeIterator != item.constEnd()) if (attributeIterator != item.constEnd())
palette.setColor(QPalette::WindowText, QRgb(int(attributeIterator.value().toDouble()))); palette.setColor(QPalette::WindowText, QRgb(int(attributeIterator.value().toDouble())));

23
src/plugins/platforms/winrt/qwinrtscreen.cpp
View File

@ -37,6 +37,9 @@
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include <d3d11.h> #include <d3d11.h>
#include <dxgi1_2.h> #include <dxgi1_2.h>
#ifndef Q_OS_WINPHONE
#include <dxgi1_3.h>
#endif
#include "qwinrtbackingstore.h" #include "qwinrtbackingstore.h"
#include "qwinrtinputcontext.h" #include "qwinrtinputcontext.h"
@ -1078,12 +1081,14 @@ HRESULT QWinRTScreen::onSizeChanged(ICoreWindow *, IWindowSizeChangedEventArgs *
d->logicalSize = logicalSize; d->logicalSize = logicalSize;
if (d->eglDisplay) { if (d->eglDisplay) {
const QRect newGeometry = geometry(); const QRect newGeometry = geometry();
#ifdef Q_OS_WINPHONE // Resize the EGL window int width = newGeometry.width();
const int width = newGeometry.width() * (d->orientation == Qt::InvertedPortraitOrientation || d->orientation == Qt::LandscapeOrientation ? -1 : 1); int height = newGeometry.height();
const int height = newGeometry.height() * (d->orientation == Qt::InvertedPortraitOrientation || d->orientation == Qt::InvertedLandscapeOrientation ? -1 : 1); #ifdef Q_OS_WINPHONE // Windows Phone can pass in a negative size to provide orientation information
width *= (d->orientation == Qt::InvertedPortraitOrientation || d->orientation == Qt::LandscapeOrientation) ? -1 : 1;
height *= (d->orientation == Qt::InvertedPortraitOrientation || d->orientation == Qt::InvertedLandscapeOrientation) ? -1 : 1;
#endif
eglSurfaceAttrib(d->eglDisplay, d->eglSurface, EGL_WIDTH, width); eglSurfaceAttrib(d->eglDisplay, d->eglSurface, EGL_WIDTH, width);
eglSurfaceAttrib(d->eglDisplay, d->eglSurface, EGL_HEIGHT, height); eglSurfaceAttrib(d->eglDisplay, d->eglSurface, EGL_HEIGHT, height);
#endif
QWindowSystemInterface::handleScreenGeometryChange(screen(), newGeometry, newGeometry); QWindowSystemInterface::handleScreenGeometryChange(screen(), newGeometry, newGeometry);
QPlatformScreen::resizeMaximizedWindows(); QPlatformScreen::resizeMaximizedWindows();
handleExpose(); handleExpose();
@ -1113,6 +1118,16 @@ HRESULT QWinRTScreen::onActivated(ICoreWindow *, IWindowActivatedEventArgs *args
HRESULT QWinRTScreen::onSuspended(IInspectable *, ISuspendingEventArgs *) HRESULT QWinRTScreen::onSuspended(IInspectable *, ISuspendingEventArgs *)
{ {
#ifndef Q_OS_WINPHONE
Q_D(QWinRTScreen);
ComPtr<ID3D11Device> d3dDevice;
const EGLBoolean ok = eglQuerySurfacePointerANGLE(d->eglDisplay, EGL_NO_SURFACE, EGL_DEVICE_EXT, (void **)d3dDevice.GetAddressOf());
if (ok && d3dDevice) {
ComPtr<IDXGIDevice3> dxgiDevice;
if (SUCCEEDED(d3dDevice.As(&dxgiDevice)))
dxgiDevice->Trim();
}
#endif
QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationSuspended); QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationSuspended);
QWindowSystemInterface::flushWindowSystemEvents(); QWindowSystemInterface::flushWindowSystemEvents();
return S_OK; return S_OK;

6
tests/auto/dbus/qdbusmarshall/tst_qdbusmarshall.cpp
View File

@ -33,14 +33,16 @@
#include <QtCore/QtCore> #include <QtCore/QtCore>
#include <QtTest/QtTest> #include <QtTest/QtTest>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include <QtDBus/private/qdbusutil_p.h>
#include <QtDBus/private/qdbusconnection_p.h>
#include "common.h" #include "common.h"
#include <limits> #include <limits>
#include <dbus/dbus.h> #include <dbus/dbus.h>
#define QT_LINKED_LIBDBUS
#include <QtDBus/private/qdbusutil_p.h>
#include <QtDBus/private/qdbusconnection_p.h>
static const char serviceName[] = "org.qtproject.autotests.qpong"; static const char serviceName[] = "org.qtproject.autotests.qpong";
static const char objectPath[] = "/org/qtproject/qpong"; static const char objectPath[] = "/org/qtproject/qpong";
static const char *interfaceName = serviceName; static const char *interfaceName = serviceName;

33
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
View File

@ -233,17 +233,11 @@ void tst_QWindow::resizeEventAfterResize()
void tst_QWindow::positioning_data() void tst_QWindow::positioning_data()
{ {
QTest::addColumn<int>("windowflags"); QTest::addColumn<int>("windowflags");
QTest::addColumn<int>("resizecount");
QTest::newRow("default") << int(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint | Qt::WindowFullscreenButtonHint) QTest::newRow("default") << int(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint | Qt::WindowFullscreenButtonHint);
#if defined(Q_OS_OSX) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
<< 4;
#else
<< 3;
#endif
#ifdef Q_OS_OSX #ifdef Q_OS_OSX
QTest::newRow("fake") << int(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint) << 4; QTest::newRow("fake") << int(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
#endif #endif
} }
@ -262,7 +256,6 @@ void tst_QWindow::positioning()
const QRect geometry(m_availableTopLeft + QPoint(80, 80), m_testWindowSize); const QRect geometry(m_availableTopLeft + QPoint(80, 80), m_testWindowSize);
QFETCH(int, windowflags); QFETCH(int, windowflags);
QFETCH(int, resizecount);
Window window((Qt::WindowFlags)windowflags); Window window((Qt::WindowFlags)windowflags);
window.setGeometry(QRect(m_availableTopLeft + QPoint(20, 20), m_testWindowSize)); window.setGeometry(QRect(m_availableTopLeft + QPoint(20, 20), m_testWindowSize));
window.setFramePosition(m_availableTopLeft + QPoint(40, 40)); // Move window around before show, size must not change. window.setFramePosition(m_availableTopLeft + QPoint(40, 40)); // Move window around before show, size must not change.
@ -273,8 +266,7 @@ void tst_QWindow::positioning()
window.showNormal(); window.showNormal();
QCoreApplication::processEvents(); QCoreApplication::processEvents();
QTRY_COMPARE(window.received(QEvent::Resize), 1); QTest::qWaitForWindowExposed(&window);
QTRY_VERIFY(window.received(QEvent::Expose) > 0);
QMargins originalMargins = window.frameMargins(); QMargins originalMargins = window.frameMargins();
@ -284,25 +276,22 @@ void tst_QWindow::positioning()
QPoint originalPos = window.position(); QPoint originalPos = window.position();
QPoint originalFramePos = window.framePosition(); QPoint originalFramePos = window.framePosition();
window.reset();
window.setWindowState(Qt::WindowFullScreen); window.setWindowState(Qt::WindowFullScreen);
QCoreApplication::processEvents(); QCoreApplication::processEvents();
#if defined(Q_OS_BLACKBERRY) // "window" is the "root" window and will always be shown fullscreen // On BB10 the window is the root window and fullscreen, so nothing is resized.
// so we only expect one resize event #if !defined(Q_OS_BLACKBERRY)
Q_UNUSED(resizecount); QTRY_VERIFY(window.received(QEvent::Resize) > 0);
QTRY_COMPARE(window.received(QEvent::Resize), 1);
#else
QTRY_COMPARE(window.received(QEvent::Resize), 2);
#endif #endif
QTest::qWait(2000); QTest::qWait(2000);
window.reset();
window.setWindowState(Qt::WindowNoState); window.setWindowState(Qt::WindowNoState);
QCoreApplication::processEvents(); QCoreApplication::processEvents();
#if defined(Q_OS_BLACKBERRY) // "window" is the "root" window and will always be shown fullscreen // On BB10 the window is the root window and fullscreen, so nothing is resized.
// so we only expect one resize event #if !defined(Q_OS_BLACKBERRY)
QTRY_COMPARE(window.received(QEvent::Resize), 1); QTRY_VERIFY(window.received(QEvent::Resize) > 0);
#else
QTRY_COMPARE(window.received(QEvent::Resize), resizecount);
#endif #endif
QTRY_COMPARE(originalPos, window.position()); QTRY_COMPARE(originalPos, window.position());