Commit Graph

20881 Commits

Author SHA1 Message Date
Tor Arne Vestbø
c432960718 iOS: Be more thorough when looking for current first responder
The technique of sending an action does not always end up at the actual
first responder, but it will end up in a responder in the responder
chain of the first responder, so we continue searching the subviews
recursively until we find the real first-responder.

Change-Id: I6abc9bc18eb127fa4b317cd308783c0ecfcd670a
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2014-11-03 18:46:11 +01:00
Tor Arne Vestbø
d563f6142b iOS: Make QIOSTextInputResponder a proper first-responder during text input
Instead of faking it, by returning YES for isFirstResponder, which caused
issues when iOS would try to dismiss the keyboard by resigning the true
first-responder.

Change-Id: I816c4cf9c699d72995ce7968e1f1a4aa9c9c167e
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
2014-11-03 18:45:53 +01:00
Giuseppe D'Angelo
d8b45a360f QFileDialog: prevent section collapsing in the main selection area
In the non-native QFileDialog, a QSplitter separates the two central
views (the list view of "places" and the tree view for navigating
the file system).

Unfortunately, that splitter allows sections to be collapsed,
resulting in a weird status where the user doesn't
understand what has just happened and thinks that (s)he may have
broken something. Worse, that gets actually saved into the
application settings, so the splitter may stay collapsed forever.

Instead, let's simply prevent sections from being collapsible.

Task-number: QTBUG-19467
Change-Id: I11ff7c55a5535680a3edce5f4e70c9338291b94f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-11-03 18:28:45 +01:00
Giuseppe D'Angelo
305f755d4b Regenerate qfiledialog_embedded.ui
The old designer generator inserted stray spaces etc.;
save it again with the new designer to fix those.

Change-Id: I3890dd942970d9da71582ccb70b75d59888304bf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-11-03 18:28:42 +01:00
Christian Strømme
d099e27cfc Android: Fix input method hints.
1. Add comment about the magic TYPE_NUMBER_VARIATION_PASSWORD value.
2. ImhHiddenText, ImhNoPredictiveText and ImhSensitiveData should all
   disable suggestions.
3. Only ImhSensitiveData sets TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
4. Don't OR date and time to get DateTime...

Task-number: QTBUG-38080
Change-Id: If456563983130e9af409ffa8cb717ddf259f1d6b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2014-11-03 18:25:33 +01:00
Christian Strømme
0df7ab1cab Android: Remove AttachedJNIEnv class.
The JNI environment should be managed by QJNIEnvironmentPrivate
directly or through QJNIObjectPrivate. There is also a clear
difference between calls coming from or going into Java code.
Calls coming from Java already comes with the 'right' environment and
in most cases no extra considerations or set-up is needed.

Change-Id: I92d935ddfb70332041869185d5a92438930ff9b9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2014-11-03 18:25:21 +01:00
Christian Strømme
078380df1e Android: Simplify the jni code in QtAndroidMenu
This is one of several fixes where the goal is to simplify the jni code
by letting QJNI manage the environment.

Change-Id: Ia714e25fbb3fcd170150392e822b0a3fc3812818
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2014-11-03 18:25:16 +01:00
Christian Strømme
4835808287 Android: Simplify the jni code in QtAndroidInput
Let the QJNI classes manager the jni environment and caching of jni
handles.

Change-Id: I8c238375026adf449d6e6e2b521caa6cd63a0fb4
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2014-11-03 18:25:11 +01:00
Christian Strømme
7a3a3a5694 Android: Add runOnUiThread() function
Enables QRunnables to be run on the UI thread. For now this function
is only intended for internal consumption.

Change-Id: I5e2abb06104219a9dd55b3308113056e4da5fa07
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2014-11-03 18:24:56 +01:00
Tor Arne Vestbø
c998200282 Don't build or use qt_convert_rgb888_to_rgb32_neon on ARM64/AArch64
The assembly code doesn't build on that architecture yet:

    qimage_neon.cpp:78:17: error: vector register expected
                "vld3.8     { d0, d1, d2 }, [%[SRC]] !\n\t"
                ^
    <inline asm>:1:15: note: instantiated into assembly here
        vld3.8     { d0, d1, d2 }, [x1] !
                     ^
    qimage_neon.cpp:78:57: error: unrecognized instruction mnemonic
                "vld3.8     { d0, d1, d2 }, [%[SRC]] !\n\t"
                                                        ^
    <inline asm>:2:2: note: instantiated into assembly here
        vswp d0, d2
        ^
    qimage_neon.cpp:79:31: error: vector register expected
                "vswp d0, d2\n\t"
                              ^
    <inline asm>:3:15: note: instantiated into assembly here
        vst4.8     { d0, d1, d2, d3 }, [x8,:64] !
                     ^

Change-Id: I8fe93b3940d971c0aed5973fe6e1a5e2f362df3c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-11-03 18:17:35 +01:00
Nico Vertriest
30801d2d5c Doc: corrected wrong equivalent of obsolete QGraphicsItem::rotate
Task-number: QTBUG-39027
Change-Id: Icb5998a4e28edbc6952bc79d970c5ce6dbe57d69
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
2014-11-03 17:15:05 +01:00
Nico Vertriest
9571e0b6cd Doc: corrected autolink issue animation
Task-number: QTBUG-40362
Change-Id: If89a8ae6aeecd4060a34f987baaf55c12439e7ea
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2014-11-03 16:54:56 +01:00
Maurice Kalinowski
a31ad5b73a WinRT: Set WindowTitle in application switcher
Add platform backend for QWinRTWindow::setWindowTitle.

Task-number: QTBUG-40736
Change-Id: I0b03c9b5977368b38ba63044b00178c3f2bb0b86
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2014-11-03 10:58:26 +01:00
Gatis Paeglis
1b80e7a9d3 Store clipboard before exiting native GTK dialog
Gtk library usually takes care of this when the main
Gtk loop ends, but since Gtk's main even loop is not
used in QGtk2Dialog we have to store clipboard's content
with help of gtk_clipboard_store(). This function
sends a SAVE_TARGETS request to X11 clipboard manager
to save clipboards contents as required by ICCCM.

Task-number: QTBUG-34475
Change-Id: If784c425ea4a36ec1c3a8ddc0cdec080f57681a5
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
2014-11-03 10:04:07 +01:00
Friedemann Kleint
1ef505d018 Fix warning about unused variable in qprintengine_win.cpp.
qglobal.h:979:34: warning: unused variable 'q' [-Wunused-variable]                                 ^
kernel\qprintengine_win.cpp:719:5: note: in expansion of macro 'Q_Q'

Change-Id: I7fbad6c8341a3df1a06d3914209dec22876a2f09
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
2014-11-03 09:14:39 +01:00
Thiago Macieira
627b70d768 Fix warning caught by Clang on Linux
qglxintegration.h:78:17: error: private field 'm_screen' is not used [-Werror,-Wunused-private-field]

Change-Id: I7ffeda1dd4be962a4bfb43ebd3aa1dbd969a9837
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
2014-11-03 07:54:36 +01:00
Gabriel de Dietrich
e8f223cf48 QMacStyle: More tweaks for editable QComboBox
Note that at one point we need to use Cocoa to render the combo box, but
only if we're dealing with Qt Quick controls.

Also worth noticing, there's currently a bug in Cocoa when rendering
inactive combob boxes. We faithfully reproduce it in Qt for now. We'll
fix it when Apple does.

Finally, we need to start constraininig the combo boxes height. Cocoa
has not supported variable height combo boxes for years, and will even
spit the following warning if we try to do something smart.

   This application is trying to draw a very large combo box, 28 points
   tall.  Vertically resizable combo boxes are not supported, but it
   happens that 10.4 and previous drew something that looked kind of sort
   of okay.  The art in 10.5 does not break up in a way that supports that
   drawing.  This application should be revised to stop using large combo
   boxes.  This warning will appear once per app launch.

Task-number: QTBUG-40833
Task-number: QTBUG-42067
Change-Id: I6512a6a581d446a28585db22fe4dbeac09499321
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2014-11-02 11:00:56 +01:00
Adam Strzelecki
c0a54efc40 Build Qt for OS X and iOS with relative rpath
Defaulting to absolute_library_soname on configure -rpath is no longer
necessary as now we support @rpath install name ids on OS X and iOS.

This also sets QMAKE_SONAME_PREFIX to @rpath for Qt modules when built with
rpath configuration.

This makes Qt libraries relocatable on OS X. Qt SDK is not yet relocatable
though, because plugin location (including cocoa plugin) is still resolved
using absolute path (see QTBUG-14150), also there are several absolute paths
hardcoded in qmake mkspecs pri files.

Task-number: QTBUG-31814
Change-Id: Ie9dffefcd2a946c1580293d433621c1adb7e06c4
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2014-11-01 19:27:23 +01:00
Adam Strzelecki
e0676a954c Add rpath pointing to Qt libraries in OS X and iOS
This is triggered only when app is using Qt and Qt was built with "rpath"
configuration and project does not specify QMAKE_RPATHDIR explicitly.

Added rpath is made relative to app binary location if target path lies inside
Qt SDK, so all SDK bundled tools and examples will work automatically without
any changes. Tests are an exception here, since they are being run from their
build location by CI, we may not use relative rpath that work only in install
location.

Task-number: QTBUG-31814
Change-Id: I3690f29d2b5396a19c1dbc92ad05e6c028f8515b
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2014-11-01 19:26:12 +01:00
J-P Nurmi
e8d6d4f81c QAndroidPlatformClipboard: fix build in release mode
Q_ASSERT expands to nothing in release => mode unused.

Change-Id: Ieb9ec4382e925250e1146239ce061763003ff6ba
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-11-01 01:08:05 +01:00
Jan Arve Sæther
8cbbdae24c Always invalidate the iOS accessibility cache
This was observed in the weather app, where sometimes we could not find
an items window. This could only be observed in the search results of
the cities. (while VKB was visible).

The old code traversed up to the QQuickListView and then it could not
traversed further up in the parent hierarchy. Because of this it
could also not find the associated window handle.
The reason for this is unknown, but maybe it could be related to the
fact that QQuickListView is a Component.

Regardless of this, invalidate the cache should invalidate everything.
We also traverse through all top level windows, but on iOS there should
not be too many top level windows...

Change-Id: I56a496435bb529a53d5ece8446cd2eeff502af84
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2014-11-01 00:09:13 +01:00
Thiago Macieira
3b86bd5406 Reenable C++11 for ICC on OS X
It's fixed for the Intel Composer XE 2015 (compiler version 15.0).

Change-Id: I7960b2128743081e905d4b96acf55360f744fc69
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
2014-10-31 22:22:02 +01:00
Thiago Macieira
1e9db9f5e1 Enable C++11 atomics with Clang
I don't know why it was an #if 0. The __has_feature has been there for a
while. But, just to be sure, we check the presence of the header too.

Change-Id: I36e34c9e8fd4ce55c98966d2fad246b77eb16597
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
2014-10-31 22:21:15 +01:00
Thiago Macieira
1b961e8b5d Fix compilation of <atomic> with ICC and libc++
The libc++ header does this:

 #if !__has_feature(cxx_atomic)
 #error <atomic> is not implemented

So we can't enable the feature until the compiler reports true for that
test.

Change-Id: I96f1c7eea8b93d93bd721fe5a85fa987339d091f
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
2014-10-31 22:20:53 +01:00
Roland Winklmeier
a8df998290 Make QTestEventLoop::exitLoop() thread-safe
QTestEventLoop::exitLoop() is used by QSignalSpy to stop event
processing when the connected signal has been received. The design
of QSignalSpy requires QTestEventLoop::exitLoop() to be
thread-safe, which it wasn't. When QSignalSpy is connected
to a signal in a different thread, exitLoop() was called from
the thread which emitted the signal and not the one in which
QTestEventLoop is running. This caused troubles when killing
the internal timer.

This patch adds a check in the beginning of exitLoop(). If
it is called from a different thread, it will post an event
into the message queue in which QTestEventLoop is running
and execute it there.

Change-Id: Icb8c8ff2f5344800ee6c6125b98c677c7a196c32
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-10-31 22:18:34 +01:00
Lars Knoll
9572dec3d7 Remove unused variable
Also fixes a compiler warning with clang

Change-Id: I99beb7e099477b2b8b53af0e9fd32a7605a6c08a
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2014-10-31 21:17:05 +01:00
Lars Knoll
17e5b577b0 Cleanup: Remove some obsolete code supporting a pre-4.3 format
Loading a dock window state saved by a Qt 4.2 app is not
something we need to support anymore.

Change-Id: I9ee6e2c742b31114081852e7236cfc8696b9b270
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2014-10-31 21:16:54 +01:00
Thiago Macieira
6336ae831d Enable the latest versions of GCC, Clang and ICC with -Werror
Tested with GCC 4.9, Clang from XCode 5.1 and ICC 15 beta.

Clang 3.5 (pre-release) cannot compile qtdeclarative yet with -Werror
due to invalid C++ code there that calls member functions on null
pointers.

Change-Id: Ic2845371a1899716985bc0813dfb820fa418e207
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-10-31 19:18:01 +01:00
Tor Arne Vestbø
8cce08fbf9 iOS: Make sure we update hints and platform data on IM enable/disable
Change-Id: If4d9c9c769b598a3194a7cd5bbe5c74e7650694b
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2014-10-31 14:42:55 +01:00
Olivier Goffart
08b1afc8f4 Mark QMetaMethod and related constructor as constepxr
qtdelcarative's qquickaccessibleattached.cpp contains now some static
instance of QMetaMethod.  Marking the constructor as constexpr,
let GCC to remove call to the constructor at load time.

Change-Id: Ic5ab7db0d06caa08f15d65d3bb5f22a34a111fee
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2014-10-31 14:14:27 +01:00
Jędrzej Nowacki
f0b7abf2ef Lower QVariant::userType call count
We know that type id can't be changed, let pass this information to the
compiler.

Change-Id: I105b460417288b84250a954571c247608976f8f7
Reviewed-by: Stephen Kelly <steveire@gmail.com>
2014-10-31 13:39:33 +01:00
Friedemann Kleint
e76b0c05f2 Windows: Create touch device in initialization.
Previously, the device was delay-created, which is a problem
if its type is to be used for determinining the pan gesture type.

Task-number: QTBUG-40461
Change-Id: I2dee3d7a3786a0fdf0a9b2b9e174dd121697ab44
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
2014-10-31 13:26:36 +01:00
Allan Sandfeld Jensen
7245599a8c Handle mounts under /run
We shouldn't excluded all volumes under /run since some distos will
mount filesystems there. Instead we should exclude all filesystems with
the type "tmpfs" that /run has, and rpc_pipefs that is mounted below
/run. Tmpfs" is excluded for all UNIX systems since the BSDs have
a similarly named filesystem.

Change-Id: I03fdac515c0bfb1b824b2e3eae1022dd699c0998
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-10-31 13:26:27 +01:00
Timur Pocheptsov
85ea2434b1 Cocoa plugin - fix a resource leak
The patch 916dfcb827 while fixing one problem,
introduced another - leaking CGImage.

Change-Id: I08db6ea9fa97ae3489a0bfa1f93e0d18f3671885
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2014-10-31 13:05:37 +01:00
Giuseppe D'Angelo
41ba4b3956 QShapedPixmapWindow: do not leak the backing store
Change-Id: Id7cc8cbbcd62c546055d525473f90d2bad0c144a
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-10-31 06:15:32 +01:00
Thiago Macieira
c28045b118 Fix warnings about size conversion in QList
Because difference_type is 64-bit on 64-bit systems, there's a
downconversion warning from MSVC and possibly other compilers when it
gets passed to functions taking simply int.

Task-number: QTBUG-41092
Change-Id: I46a710810f4a57b8b84c4933f419a1f1fdf6bb5a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-10-31 03:57:30 +01:00
Thiago Macieira
5368e44a86 Autotest: synchronize with the peer before emitting more signals
Several of the unit tests request that the peer emit more than one
signal, but only handle one. The rest of the signals stay queued in the
socket and will be delivered at the next test, causing it to fail often.

This doesn't happen in the tests with the bus. There, we don't receive
the extraneous signals due to AddMatch/ReceiveMatch on each signal
individually and the synchronous nature of the emission (the signals
have already been emitted by the next AddMatch and cannot match it).

Task-number: QTBUG-42145
Change-Id: I743a0553074972042fca46b76db5d9e7b3209620
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2014-10-31 03:57:24 +01:00
Thiago Macieira
d0ed6dc146 Report the system error on why chmod(2) failed in XDG_RUNTIME_DIR
This is a very rare occurrence: if the user is the owner of the
directory, the user can chmod(2), and we already checked that the user
is the owner. However, chmod(2) can still fail on read-only fs and on
hardened systems.

Task-number: QTBUG-41735
Change-Id: I8f8bac763bf5a6e575ed59dac55bd265e5b66271
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: David Faure <david.faure@kdab.com>
2014-10-31 03:57:19 +01:00
Thiago Macieira
fc2fcacfcc Don't always chmod the XDG_RUNTIME_DIR
Since the current user is the owner of the dir, we'll get 0x7700 as
permissions, not just 0x700. With the wrong check, we were always doing
an unnecessary chmod.

Task-number: QTBUG-41735
Change-Id: Ib1fc258fef4bf526baa9c71201f9b78d36f5454f
Reviewed-by: David Faure <david.faure@kdab.com>
2014-10-31 03:57:02 +01:00
Thiago Macieira
85da1625e4 Attempt to make QFile I/O 64-bit safe
Use qint64 wherever possible. The linear buffer is never requested to
allocate that much memory (always limited), but at least we ensure we're
not dropping bits where we shouldn't.

Windows's POSIX compatibility layer is never largefile enabled, so it is
always necessary to chunk large reads and writes. On Unix, this will
be rare, unless someone passed -no-largefile to configure, for some
weird reason.

Unfortunately, this is not testable, unless we can allocate a buffer
with 4 GB or more in size. The test for this would be to open a file we
know to be small, then try to read 4 GB + 1 byte. If everything works
correctly, we'll read the full file; if there was a truncation, we'd
read one byte.

Change-Id: If3ee511bf1de17e0123c85bbcaa463b9972746ce
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-10-31 03:56:11 +01:00
Jørgen Lind
f91b81ca39 Remove executable mode on qwidget_window.pro
Change-Id: Ibb522af33e8490719010af441cce712bdc7a71bf
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2014-10-31 02:23:56 +01:00
Thiago Macieira
9150e04b17 Import the FreeBSD strtoXX functions
Obtained from:
http://freebsd.googlecode.com/git-history/4658f9721d395818ba760a79b1cb0b54957d4576/lib/libc/stdlib/strtoull.c
http://freebsd.googlecode.com/git-history/4658f9721d395818ba760a79b1cb0b54957d4576/lib/libc/stdlib/strtoll.c

Changes:
 - remove the #includes and the SCCSID
 - rename from strtoxx_l to qt_strtoxx (merging the two functions)
 - remove __restrict
 - remove the locale_t parameter and use ascii_isspace instead of isspace_l

Change-Id: I1e522e12da90eb35eefcf4025102dc11b22c60a5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-10-30 22:49:51 +01:00
Friedemann Kleint
0630c82bd0 Add manual test for touch events.
Unlike qtouchevents, this provides a touch area which logs its
events and devices.

Task-number: QTBUG-40461
Change-Id: Iaaa3589dd692caf8c7078f5ed2ff1e8b2322a369
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2014-10-30 21:35:44 +01:00
J-P Nurmi
4387c5d6af QWindowsStyle: fix CE_ComboBoxLabel text color
CE_ComboBoxLabel was relying on a font color / painter pen set
by CC_ComboBox. This change ensures that CE_ComboBoxLabel has
correct color when CC_ComboBox and CE_ComboBoxLabel are drawn
independently.

Change-Id: Id548d831fdde5885bc7c157d55de6235ef3f0a56
Task-number: QTBUG-41702
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-10-30 21:29:45 +01:00
Dyami Caliri
f3fb787a32 OS X: fix CFString leaks in mime classes
Some CFStringRefs created with CFStringCreate* methods were not being
released. Using the QCFString helper class to perform auto release.

Change-Id: I36d15c0d35118524089e99ea3cd53c41342d6308
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2014-10-30 21:23:37 +01:00
Dyami Caliri
dd6876f3fd QCocoaPrintDevice: fix bad CFRelease
CFRelease should be called IFF PMPrinterCopyDescriptionURL succeeds

Change-Id: Id289aea3a4e3da397dae4062319256a043538597
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2014-10-30 21:23:10 +01:00
Fawzi Mohamed
af5f6e35b6 xcodegenerator: use a copy resource phase if possible
Since commmit 0127962e47 the
PBXResourcesBuildPhase is used only for ICONS, because the old
behavior of using it when target path is not given differed from
the documentation and behavior of the makefile generator by using
Contents/Resources as target directory when targeting osx.

The PBXResouceBuildPhase optimizes png, compiles xib or asset catalogs
and copies the rest.
The advantage is that it makes it easy to add resources to the bundle,
the only problem is that the target directory is always the resource
directory.

The copy operation currently used does not compile resources, which
makes adding .xib (for the Launch File required to support iphone 6)
and asset catalogs difficult.

So we restore the old 5.3 behavior for ios, and use the build
resources phase when possible on osx (target Contents/Resources).

On osx this still implies a difference between the makefile
generator and the xcode generator: only the latter compiles resources.

Change-Id: Id1853693e88fc46562b044efdea2bf5f9da2c98c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2014-10-30 14:03:50 +01:00
Lars Knoll
1487a93e46 Fix a possible use after free
Found by coverity. The cachedIcon can be deleted
when being inserted into the icon cache (in QCache::insert).
So copy it to icon before trying to insert it into the cache.

Change-Id: I5ed13c0c7ecb8f8f13285ca5d06237493dbea479
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
2014-10-30 13:46:42 +01:00
Laszlo Agocs
848d29cca3 Raspi: default platform plugin is eglfs
Not wayland. Use the default of eglfs coming from linux_device_pre.conf.

Qt 5.4 includes QtWayland and the platform plugin from there may get built
unexpectedly. The result is that the Pi setup that worked with 5.3 and eglfs
stops functioning.

Task-number: QTBUG-40538
Change-Id: If894c7ddd7b40a22272797d94ce1a545b7ab43f2
Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2014-10-30 13:44:29 +01:00
Kai Koehne
a5c624622b Fix compiler warning in securesocketclient example
The warning was introduced in a133cea2 .

Change-Id: Ia8180b6c7d83f57cba79519bf4c0e3bf97966c16
Reviewed-by: Richard J. Moore <rich@kde.org>
2014-10-30 10:52:51 +01:00