diff options
| author | Oswald Buddenhagen <[email protected]> | 2013-03-20 13:46:57 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <[email protected]> | 2013-03-20 13:49:28 +0100 |
| commit | 76c0be34cd4ff4564693162fa7528463e23ce9d8 (patch) | |
| tree | f165b7bc319548fb0082365411a871028f92e89e /src/concurrent/qtconcurrentstoredfunctioncall.h | |
| parent | 27b4fe96b59e9e63d1e570e802c072e9afdfb2d4 (diff) | |
| parent | 36cb3f3f655a9090c82de609010cbfb88651a0f3 (diff) | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Conflicts:
src/gui/text/qfontdatabase.cpp
src/gui/text/qharfbuzz_copy_p.h
src/widgets/kernel/qapplication.cpp
src/widgets/kernel/qcoreapplication.cpp
Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b
Diffstat (limited to 'src/concurrent/qtconcurrentstoredfunctioncall.h')
| -rw-r--r-- | src/concurrent/qtconcurrentstoredfunctioncall.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/concurrent/qtconcurrentstoredfunctioncall.h b/src/concurrent/qtconcurrentstoredfunctioncall.h index aa590a3fb85..8d49ab3dfc7 100644 --- a/src/concurrent/qtconcurrentstoredfunctioncall.h +++ b/src/concurrent/qtconcurrentstoredfunctioncall.h @@ -48,7 +48,6 @@ #ifndef QT_NO_CONCURRENT #include <QtConcurrent/qtconcurrentrunbase.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -1305,7 +1304,6 @@ private: #endif // Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT |