diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
| commit | 440f452aa3a5609e5f6006a03ac36d41462d5908 (patch) | |
| tree | 598d682291945055e4f6feb08a228212648482c1 /src/plugins/platforms/uikit/examples/qmltest/qmltest_Prefix.pch | |
| parent | cd1e62ffc121cc68c5a133a8095d431f04d966ce (diff) | |
| parent | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro
Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'src/plugins/platforms/uikit/examples/qmltest/qmltest_Prefix.pch')
| -rw-r--r-- | src/plugins/platforms/uikit/examples/qmltest/qmltest_Prefix.pch | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/plugins/platforms/uikit/examples/qmltest/qmltest_Prefix.pch b/src/plugins/platforms/uikit/examples/qmltest/qmltest_Prefix.pch deleted file mode 100644 index c06715c661..0000000000 --- a/src/plugins/platforms/uikit/examples/qmltest/qmltest_Prefix.pch +++ /dev/null @@ -1,8 +0,0 @@ -// -// Prefix header for all source files of the 'qmltest' target in the 'qmltest' project -// - -#ifdef __OBJC__ - #import <Foundation/Foundation.h> - #import <UIKit/UIKit.h> -#endif |