feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove unneeded #ifdefs.

Browse Source 
Change-Id: I696133c42a142a8c596703fc8ce0250b58993d99
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Christian Kandeler
2013-10-07 11:06:41 +02:00
parent 03e76337ca
commit 90a056e1cb
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/main.cpp
View File

@@ -35,6 +35,7 @@
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <extensionsystem/pluginspec.h> #include <extensionsystem/pluginspec.h>
#include <qtsingleapplication.h> #include <qtsingleapplication.h>
#include <utils/hostosinfo.h>
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
@@ -312,11 +313,11 @@ int main(int argc, char **argv)
#if QT_VERSION >= 0x050100 #if QT_VERSION >= 0x050100
app.setAttribute(Qt::AA_UseHighDpiPixmaps); app.setAttribute(Qt::AA_UseHighDpiPixmaps);
# if defined(Q_OS_WIN) || defined(Q_OS_MAC) if (Utils::HostOsInfo::isWindowsHost() || Utils::HostOsInfo::isMacHost()) {
// Prevent native windows from being created for the sibling widgets of the welcome screen. // Prevent native windows from being created for the sibling widgets of the welcome screen.
// Causes flicker on Linux, though. // Causes flicker on Linux, though.
app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings); app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
# endif }
#endif #endif
// Manually determine -settingspath command line option // Manually determine -settingspath command line option

6
src/plugins/ios/iosconstants.h
View File

@@ -42,12 +42,6 @@ enum IosQemuStatus {
IosQemuUserReason IosQemuUserReason
}; };
#ifdef Q_OS_WIN32
#define IOS_BAT_SUFFIX ".bat"
#else
#define IOS_BAT_SUFFIX ""
#endif
} // namespace Internal } // namespace Internal
namespace Constants { namespace Constants {