diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 14:44:16 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-12 14:44:37 +0200 |
| commit | cac497e7a45fc901798663006ac7894b7197a549 (patch) | |
| tree | f79fb413d3adfd2fa181ba672832bb342c38a607 /src | |
| parent | e99cb6767b54aa9b082c4fd8bef93760c563da59 (diff) | |
| parent | 5ce41d1e77db3f46c396834f698826f4fd998344 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ie916db2bc4973016541176363d08c5dd14ff6b69
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmldevtools/qmldevtools.pro | 5 | ||||
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 3 | ||||
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/qmldevtools/qmldevtools.pro b/src/qmldevtools/qmldevtools.pro index a65ef94da9..10e1ce0275 100644 --- a/src/qmldevtools/qmldevtools.pro +++ b/src/qmldevtools/qmldevtools.pro @@ -3,9 +3,10 @@ TARGET = QtQmlDevTools QT = core CONFIG += static no_module_headers internal_module -MODULE_PRIVATE_INCLUDES = \ +MODULE_INCLUDES = \ \$\$QT_MODULE_INCLUDE_BASE \ - \$\$QT_MODULE_INCLUDE_BASE/QtQml \ + \$\$QT_MODULE_INCLUDE_BASE/QtQml +MODULE_PRIVATE_INCLUDES = \ \$\$QT_MODULE_INCLUDE_BASE/QtQml/$$QT.qml.VERSION \ \$\$QT_MODULE_INCLUDE_BASE/QtQml/$$QT.qml.VERSION/QtQml diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index f20890c378..30861d9b2e 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -61,4 +61,5 @@ sourcedirs += ../../plugins #exclude certain directories excludedirs += ../../imports/dialogs \ - ../../imports/models + ../../imports/models \ + ../../../examples/quick/dialogs diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 7b84168bb9..619c72afb8 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -108,7 +108,7 @@ public: } protected: - void timerEvent(QTimerEvent *e) + void timerEvent(QTimerEvent *) { killTimer(m_timer); m_timer = 0; |