diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-05 16:47:13 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-08-05 16:47:13 +0200 |
| commit | b53e08e3356528e7d240188c8985e205a6eaa2a2 (patch) | |
| tree | 96936333023c58e0eb585efcc55be0ba787aa047 /src/widgets/kernel/qapplication_p.h | |
| parent | c48484ea6d39909b7919577701ffeb9656bbea62 (diff) | |
| parent | 0936bc54f907066644503c7d4c390968711c73a7 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/kernel/qapplication_p.h')
| -rw-r--r-- | src/widgets/kernel/qapplication_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index d5efb62dda..29142470a7 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -214,7 +214,6 @@ public: static int enabledAnimations; // Combination of QPlatformTheme::UiEffect static bool widgetCount; // Coupled with -widgetcount switch - static bool load_testability; // Coupled with -testability switch static void setSystemPalette(const QPalette &pal); static void setPalette_helper(const QPalette &palette, const char* className, bool clearWidgetPaletteHash); |