diff options
| author | Tomasz Olszak <olszak.tomasz@gmail.com> | 2014-01-28 23:16:16 +0100 |
|---|---|---|
| committer | Tomasz Olszak <olszak.tomasz@gmail.com> | 2014-01-28 23:16:34 +0100 |
| commit | 07276a7f77253211b5efcf5e7e5c82b4a3fa0c00 (patch) | |
| tree | 996fe1ef125795200131d80f6adc2ea4e1948ab9 /mkspecs | |
| parent | e383b236b31a062838212e374b3e84bebf56837b (diff) | |
| parent | c58c98a248e104e55a7210b80a9f221bb019cbc9 (diff) | |
| download | qtbase-07276a7f77253211b5efcf5e7e5c82b4a3fa0c00.tar.gz qtbase-07276a7f77253211b5efcf5e7e5c82b4a3fa0c00.tar.bz2 qtbase-07276a7f77253211b5efcf5e7e5c82b4a3fa0c00.zip | |
Merge remote-tracking branch 'origin/stable' into wip/tizen
Change-Id: Ia03fa78a4c49e15aa4d6078884681bd63517017d
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/gcc-base-mac.conf | 4 | ||||
| -rw-r--r-- | mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp | 2 | ||||
| -rw-r--r-- | mkspecs/features/android/android.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/qt_example_installs.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/qt_module.prf | 8 |
5 files changed, 13 insertions, 5 deletions
diff --git a/mkspecs/common/gcc-base-mac.conf b/mkspecs/common/gcc-base-mac.conf index e0469f31cc..cb1e17bc90 100644 --- a/mkspecs/common/gcc-base-mac.conf +++ b/mkspecs/common/gcc-base-mac.conf @@ -12,10 +12,6 @@ include(gcc-base.conf) QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__=4 -QMAKE_CFLAGS_DEBUG += -gdwarf-2 - -QMAKE_CXXFLAGS_DEBUG += -gdwarf-2 - QMAKE_OBJECTIVE_CFLAGS = $$QMAKE_CFLAGS QMAKE_OBJECTIVE_CFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF diff --git a/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp b/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp index c351e3dbc4..91c29b5ea9 100644 --- a/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp +++ b/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp @@ -72,7 +72,7 @@ QEglFSImx6Hooks::QEglFSImx6Hooks() qputenv("FB_MULTI_BUFFER", "2"); } - mNativeDisplay = fbGetDisplayByIndex(0); + mNativeDisplay = fbGetDisplayByIndex(framebufferIndex()); fbGetDisplayGeometry(mNativeDisplay, &width, &height); mScreenSize.setHeight(height); mScreenSize.setWidth(width); diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf index 5e21f0b845..9e86110da6 100644 --- a/mkspecs/features/android/android.prf +++ b/mkspecs/features/android/android.prf @@ -8,4 +8,7 @@ contains(TEMPLATE, ".*app") { INSTALLS *= target } } +} else: contains(TEMPLATE, "lib"):!QTDIR_build:android_install { + target.path = /libs/$$ANDROID_TARGET_ARCH/ + INSTALLS *= target } diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf index 2db752c1e4..ff842ca754 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf @@ -97,6 +97,7 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) TEMPLATE = aux CONFIG -= have_target qt staticlib dll SOURCES = + OBJECTIVE_SOURCES = INSTALLS -= target } } diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 11509eeb40..c6369732c1 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -119,6 +119,14 @@ DEFINES += QT_BUILDING_QT win32 { INCLUDEPATH += tmp CONFIG += skip_target_version_ext + # If the code is really "unsafe" then it is unsafe on + # other platforms as well; so fixing these warnings just + # for MSVC builds, would clutter the code and wouldn't help + # in fixing issues that might exist on other platforms. + # Using the same functions across all supported platforms + # keeps the code clean and helps in writing code that is + # safe across all platforms. + DEFINES *= _CRT_SECURE_NO_WARNINGS } aix-g++* { |